Merge pull request #676 from stgraber/main

incus-osd/providers/operations_center: Fix self-register logic

Author: stgraber

incus-osd/internal/applications/app_common.go

@@ -397,7 +397,7 @@ func extractTarArchive(ctx context.Context, archiveRoot string, restartUnits []s
 			return fmt.Errorf("cannot restore file outside of application root '%s' (bad file '%s')", archiveRoot, filename)
 		}
 
-		mode := fs.FileMode(header.Mode)
+		mode := fs.FileMode(header.Mode) //nolint:gosec
 
 		switch header.Typeflag {
 		case tar.TypeDir:

incus-osd/internal/providers/provider_operations_center.go

@@ -136,9 +136,17 @@ func (p *operationsCenter) Register(ctx context.Context, _ bool) error {
 	}
 
 	// Register.
-	resp, err := p.apiRequest(ctx, http.MethodPost, "/1.0/provisioning/servers?token="+p.state.System.Provider.Config.Config["server_token"], bytes.NewReader(data))
-	if err != nil {
-		return err
+	var resp *api.Response
+	if p.state.System.Provider.Config.Config["server_token"] != "" {
+		resp, err = p.apiRequest(ctx, http.MethodPost, "/1.0/provisioning/servers?token="+p.state.System.Provider.Config.Config["server_token"], bytes.NewReader(data))
+		if err != nil {
+			return err
+		}
+	} else {
+		resp, err = p.apiRequest(ctx, http.MethodPost, "/1.0/provisioning/servers/:self_register", bytes.NewReader(data))
+		if err != nil {
+			return err
+		}
 	}
 
 	// Parse the response.
@@ -156,9 +164,11 @@ func (p *operationsCenter) Register(ctx context.Context, _ bool) error {
 	}
 
 	// Get the server certificate.
-	err = app.AddTrustedCertificate(ctx, p.serverURL, registrationResp.Certificate)
-	if err != nil {
-		return err
+	if registrationResp.Certificate != "" {
+		err = app.AddTrustedCertificate(ctx, p.serverURL, registrationResp.Certificate)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

incus-osd/internal/storage/storage.go

@@ -178,7 +178,7 @@ func GetFreeSpaceInGiB(path string) (float64, error) {
 		return 0.0, err
 	}
 
-	return float64(s.Bsize*int64(s.Bfree)) / 1024.0 / 1024.0 / 1024.0, nil
+	return float64(s.Bsize*int64(s.Bfree)) / 1024.0 / 1024.0 / 1024.0, nil //nolint:gosec
 }
 
 // DeviceToID takes a device path like /dev/sda and determines its "by-id" mapping, for example /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_incus_root.

incus-osd/internal/tui/tui.go

@@ -425,7 +425,7 @@ func getMachineInfo(r *api.Resources) string {
 		numCores += len(socket.Cores)
 	}
 
-	memory := int64(r.Memory.Total)
+	memory := int64(r.Memory.Total) //nolint:gosec
 
 	// Return a string like "AMD EPYC 7763 64-Core Processor (numa=8, sockets=2, cores=128, threads=256) (x86_64) / 514GiB memory".
 	return fmt.Sprintf("%s (numa=%d, sockets=%d, cores=%d, threads=%d) (%s) / %s memory", r.CPU.Sockets[0].Name, len(r.Memory.Nodes), len(r.CPU.Sockets), numCores, r.CPU.Total, r.CPU.Architecture, units.GetByteSizeStringIEC(memory, 0))