fix integer type handling (#17)

cnoe-io · Sep 25, 2023 · f01bc62 · f01bc62
1 parent 7e059df
commit f01bc62
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	golang.org/x/mod v0.11.0 // indirect
 	golang.org/x/net v0.11.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/term v0.9.0 // indirect
 	golang.org/x/text v0.10.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect

diff --git a/pkg/cmd/crd.go b/pkg/cmd/crd.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/cnoe-io/cnoe-cli/pkg/models"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"sigs.k8s.io/yaml"
 )
 
 const (
@@ -182,7 +182,7 @@ func (c *CRDModule) convert(def string) (any, string, error) {
 
 	var resourceName string
 	if doc.Spec.ClaimNames != nil {
-		resourceName = doc.Spec.ClaimNames.Kind
+		resourceName = fmt.Sprintf("%s.%s", doc.Spec.Group, doc.Spec.ClaimNames.Kind)
 	} else {
 		resourceName = fmt.Sprintf("%s.%s", doc.Spec.Group, doc.Spec.Names.Kind)
 	}
@@ -218,10 +218,14 @@ func (c *CRDModule) convert(def string) (any, string, error) {
 			"default":     fmt.Sprintf("%s/%s", doc.Spec.Group, doc.Spec.Versions[0].Name),
 		},
 			"properties", "apiVersion")
+		kind := doc.Spec.Names.Kind
+		if doc.Spec.ClaimNames != nil {
+			kind = doc.Spec.ClaimNames.Kind
+		}
 		unstructured.SetNestedMap(obj.Object, map[string]interface{}{
 			"type":        "string",
 			"description": "Kind for the resource",
-			"default":     doc.Spec.Names.Kind,
+			"default":     kind,
 		},
 			"properties", "kind")
 	}

diff --git a/pkg/cmd/fakes/crd/valid/input/cdn.yaml b/pkg/cmd/fakes/crd/valid/input/cdn.yaml
@@ -23,6 +23,10 @@ spec:
           properties:
             spec:
               properties:
+                minSize:
+                  type: integer
+                  default: 2
+                  description: Min Size.
                 resourceConfig:
                   description: ResourceConfig defines general properties of this AWS
                     resource.

diff --git a/.../full-template-awsblueprints.io.xcdn.yaml → ...t/full-template-awsblueprints.io.cdn.yaml b/.../full-template-awsblueprints.io.xcdn.yaml → ...t/full-template-awsblueprints.io.cdn.yaml
@@ -15,6 +15,10 @@ spec:
           type: string
         config:
           properties:
+            minSize:
+              type: integer
+              default: 2
+              description: Min Size.
             resourceConfig:
               description: ResourceConfig defines general properties of this AWS resource.
               properties:
@@ -50,10 +54,10 @@ spec:
               type: object
           required:
             - resourceConfig
-          title: awsblueprints.io.XCDN configuration options
+          title: awsblueprints.io.CDN configuration options
           type: object
         kind:
-          default: XCDN
+          default: CDN
           description: Kind for the resource
           type: string
         name:

diff --git a/pkg/cmd/fakes/crd/valid/output/full-template-oneof.yaml b/pkg/cmd/fakes/crd/valid/output/full-template-oneof.yaml
@@ -10,7 +10,7 @@ spec:
     - dependencies:
         resources:
           oneOf:
-            - $yaml: resources/awsblueprints.io.xcdn.yaml
+            - $yaml: resources/awsblueprints.io.cdn.yaml
             - $yaml: resources/sparkoperator.k8s.io.sparkapplication.yaml
       description: Select a AWS resource to add to your repository.
       properties:
@@ -23,7 +23,7 @@ spec:
           type: string
         resources:
           enum:
-            - awsblueprints.io.xcdn
+            - awsblueprints.io.cdn
             - sparkoperator.k8s.io.sparkapplication
           type: string
       required:

diff --git a/...put/properties-awsblueprints.io.xcdn.yaml → ...tput/properties-awsblueprints.io.cdn.yaml b/...put/properties-awsblueprints.io.xcdn.yaml → ...tput/properties-awsblueprints.io.cdn.yaml
@@ -5,6 +5,10 @@ properties:
     type: string
   config:
     properties:
+      minSize:
+        type: integer
+        default: 2
+        description: Min Size.
       resourceConfig:
         description: ResourceConfig defines general properties of this AWS resource.
         properties:
@@ -40,12 +44,12 @@ properties:
         type: object
     required:
       - resourceConfig
-    title: awsblueprints.io.XCDN configuration options
+    title: awsblueprints.io.CDN configuration options
     type: object
   kind:
-    default: XCDN
+    default: CDN
     description: Kind for the resource
     type: string
   resources:
     enum:
-    - awsblueprints.io.xcdn
+      - awsblueprints.io.cdn