client: Use api.ProjectDefaultName

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
lxc · Oct 25, 2023 · 1c8bfd5 · 1c8bfd5
1 parent c48c99f
commit 1c8bfd5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/client/incus.go b/client/incus.go
@@ -69,7 +69,7 @@ func (r *ProtocolIncus) GetConnectionInfo() (*ConnectionInfo, error) {
 
 	info.Project = r.project
 	if info.Project == "" {
-		info.Project = "default"
+		info.Project = api.ProjectDefaultName
 	}
 
 	info.Target = r.clusterTarget

diff --git a/client/incus_server.go b/client/incus_server.go
@@ -315,10 +315,10 @@ func (r *ProtocolIncus) ApplyServerPreseed(config api.InitPreseed) error {
 		// Populate default project if not specified for backwards compatbility with earlier
 		// preseed dump files.
 		if config.Server.Networks[i].Project == "" {
-			config.Server.Networks[i].Project = "default"
+			config.Server.Networks[i].Project = api.ProjectDefaultName
 		}
 
-		if config.Server.Networks[i].Project != "default" {
+		if config.Server.Networks[i].Project != api.ProjectDefaultName {
 			continue
 		}
 
@@ -395,7 +395,7 @@ func (r *ProtocolIncus) ApplyServerPreseed(config api.InitPreseed) error {
 
 	// Apply networks in non-default projects after project config applied (so that their projects exist).
 	for i := range config.Server.Networks {
-		if config.Server.Networks[i].Project == "default" {
+		if config.Server.Networks[i].Project == api.ProjectDefaultName {
 			continue
 		}
 

diff --git a/client/incus_storage_volumes.go b/client/incus_storage_volumes.go
@@ -63,7 +63,7 @@ func (r *ProtocolIncus) GetStoragePoolVolumeNamesAllProjects(pool string) (map[s
 
 		project := resourceURL.Query().Get("project")
 		if project == "" {
-			project = "default"
+			project = api.ProjectDefaultName
 		}
 
 		_, after, found := strings.Cut(resourceURL.Path, fmt.Sprintf("%s/", u.URL.Path))