Release Fixes (#175)

Tighten up the "naming" of resources that don't have a name.
unikorn-cloud · Feb 5, 2025 · bce8d50 · bce8d50
1 parent 2e7602d
commit bce8d50
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 387 deletions.
diff --git a/charts/identity/Chart.yaml b/charts/identity/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for deploying Unikorn's IdP
 
 type: application
 
-version: v0.2.53-rc7
-appVersion: v0.2.53-rc7
+version: v0.2.53-rc8
+appVersion: v0.2.53-rc8
 
 icon: https://raw.githubusercontent.com/unikorn-cloud/assets/main/images/logos/dark-on-light/icon.png
 

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
-	github.com/unikorn-cloud/core v0.1.89-rc5
+	github.com/unikorn-cloud/core v0.1.89-rc6
 	go.opentelemetry.io/otel v1.34.0
 	go.opentelemetry.io/otel/sdk v1.34.0
 	go.opentelemetry.io/otel/trace v1.34.0

diff --git a/go.sum b/go.sum
@@ -186,8 +186,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/unikorn-cloud/core v0.1.89-rc5 h1:DYT9DOO9gdqzN3U1cirxWDgvECN9vfPuZda7KQE86KI=
-github.com/unikorn-cloud/core v0.1.89-rc5/go.mod h1:UW7g0AFLjY6r3KVPv9SPu/POttZx6Tl6UZ30+s4da+M=
+github.com/unikorn-cloud/core v0.1.89-rc6 h1:yxnX+yX8sfadfbj4FkD0B/5uxLoMQm+FlKUkrIoTxc4=
+github.com/unikorn-cloud/core v0.1.89-rc6/go.mod h1:UW7g0AFLjY6r3KVPv9SPu/POttZx6Tl6UZ30+s4da+M=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=

diff --git a/hack/user_migration/main.go b/hack/user_migration/main.go
diff --git a/pkg/handler/common/common.go b/pkg/handler/common/common.go
@@ -112,7 +112,7 @@ func (c *Client) GetQuota(ctx context.Context, organizationID string) (*unikornv
 	}
 
 	if len(resources.Items) > 1 {
-		return nil, false, fmt.Errorf("%w: expected to find 1 project namespace", ErrConsistency)
+		return nil, false, fmt.Errorf("%w: expected to find 1 organization quota", ErrConsistency)
 	}
 
 	// We are going to lazily create the quota and any new quota items that come

diff --git a/pkg/handler/quotas/client.go b/pkg/handler/quotas/client.go
@@ -21,6 +21,7 @@ import (
 	goerrors "errors"
 	"slices"
 
+	"github.com/unikorn-cloud/core/pkg/constants"
 	coreopenapi "github.com/unikorn-cloud/core/pkg/openapi"
 	"github.com/unikorn-cloud/core/pkg/server/conversion"
 	"github.com/unikorn-cloud/core/pkg/server/errors"
@@ -81,7 +82,7 @@ func generate(ctx context.Context, organization *organizations.Meta, in *openapi
 	}
 
 	metadata := &coreopenapi.ResourceWriteMetadata{
-		Name: "undefined",
+		Name: constants.UndefinedName,
 	}
 
 	out := &unikornv1.Quota{

diff --git a/pkg/handler/users/client.go b/pkg/handler/users/client.go
@@ -184,7 +184,7 @@ func generate(ctx context.Context, organization *organizations.Meta, in *openapi
 	}
 
 	metadata := &coreopenapi.ResourceWriteMetadata{
-		Name: "undefined",
+		Name: constants.UndefinedName,
 	}
 
 	out := &unikornv1.User{