Merge pull request #1164 from hypnoglow/api-duplicates

Handle creation of duplicate API resources

Author: k8s-ci-robot

cmd/api.go

@@ -57,6 +57,8 @@ func (o *apiOptions) bindCmdFlags(cmd *cobra.Command) {
 		cmd.Flags().StringVar(&o.pattern, "pattern", "",
 			"generates an API following an extension pattern (addon)")
 	}
+	cmd.Flags().BoolVar(&o.apiScaffolder.Force, "force", false,
+		"attempt to create resource even if it already exists")
 	o.apiScaffolder.Resource = resourceForFlags(cmd.Flags())
 }
 

pkg/scaffold/api.go

@@ -51,6 +51,9 @@ type API struct {
 
 	// DoController indicates whether to scaffold controller files or not
 	DoController bool
+
+	// Force indicates that the resource should be created even if it already exists.
+	Force bool
 }
 
 // Validate validates whether API scaffold has correct bits to generate
@@ -63,6 +66,10 @@ func (api *API) Validate() error {
 		return err
 	}
 
+	if api.resourceExists() && !api.Force {
+		return fmt.Errorf("API resource already exists")
+	}
+
 	return nil
 }
 
@@ -205,12 +212,14 @@ func (api *API) scaffoldV2() error {
 			return fmt.Errorf("error updating kustomization.yaml: %v", err)
 		}
 
-		// update scaffolded resource in project file
-		api.project.Resources = append(api.project.Resources,
-			input.Resource{Group: r.Group, Version: r.Version, Kind: r.Kind})
-		err = saveProjectFile("PROJECT", api.project)
-		if err != nil {
-			fmt.Printf("error updating project file with resource information : %v \n", err)
+		if !api.resourceExists() {
+			// update scaffolded resource in project file
+			api.project.Resources = append(api.project.Resources,
+				input.Resource{Group: r.Group, Version: r.Version, Kind: r.Kind})
+			err = saveProjectFile("PROJECT", api.project)
+			if err != nil {
+				fmt.Printf("error updating project file with resource information : %v \n", err)
+			}
 		}
 
 	} else {
@@ -270,3 +279,17 @@ func (api *API) validateResourceGroup(r *resource.Resource) error {
 	}
 	return nil
 }
+
+// resourceExists returns true if API resource is already tracked by the PROJECT file.
+// Note that this works only for v2, since in v1 resources are not tracked by the PROJECT file.
+func (api *API) resourceExists() bool {
+	for _, resource := range api.project.Resources {
+		if resource.Group == api.Resource.Group &&
+			resource.Version == api.Resource.Version &&
+			resource.Kind == api.Resource.Kind {
+			return true
+		}
+	}
+
+	return false
+}