feat: use common remediation strategy

padok-team · Feb 9, 2023 · 8985b89 · 8985b89
1 parent e4ec67d
commit 8985b89
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 39 deletions.
diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
@@ -10,3 +10,10 @@ type OverrideRunnerSpec struct {
 	NodeSelector       map[string]string             `json:"nodeSelector,omitempty"`
 	ServiceAccountName string                        `json:"serviceAccountName,omitempty"`
 }
+
+type RemediationStrategy struct {
+	PlanOnDrift  bool `json:"planOnDrift,omitempty"`
+	ApplyOnDrift bool `json:"applyOnDrift,omitempty"`
+	PlanOnPush   bool `json:"planOnPush,omitempty"`
+	ApplyOnPush  bool `json:"applyOnPush,omitempty"`
+}
diff --git a/api/v1alpha1/terraformlayer_types.go b/api/v1alpha1/terraformlayer_types.go
@@ -28,20 +28,13 @@ type TerraformLayerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	Path                string                            `json:"path,omitempty"`
-	Branch              string                            `json:"branch,omitempty"`
-	TerraformVersion    string                            `json:"terraformVersion,omitempty"`
-	Repository          TerraformLayerRepository          `json:"repository,omitempty"`
-	RemediationStrategy TerraformLayerRemediationStrategy `json:"remediationStrategy,omitempty"`
-	PlanOnPullRequest   bool                              `json:"planOnPullRequest,omitempty"`
-	OverrideRunnerSpec  OverrideRunnerSpec                `json:"overrideRunnerSpec,omitempty"`
-}
-
-type TerraformLayerRemediationStrategy struct {
-	PlanOnDrift  bool `json:"planOnDrift,omitempty"`
-	ApplyOnDrift bool `json:"applyOnDrift,omitempty"`
-	PlanOnPush   bool `json:"planOnPush,omitempty"`
-	ApplyOnPush  bool `json:"applyOnPush,omitempty"`
+	Path                string                   `json:"path,omitempty"`
+	Branch              string                   `json:"branch,omitempty"`
+	TerraformVersion    string                   `json:"terraformVersion,omitempty"`
+	Repository          TerraformLayerRepository `json:"repository,omitempty"`
+	RemediationStrategy RemediationStrategy      `json:"remediationStrategy,omitempty"`
+	PlanOnPullRequest   bool                     `json:"planOnPullRequest,omitempty"`
+	OverrideRunnerSpec  OverrideRunnerSpec       `json:"overrideRunnerSpec,omitempty"`
 }
 
 type TerraformLayerRepository struct {

diff --git a/api/v1alpha1/terraformrepository_types.go b/api/v1alpha1/terraformrepository_types.go
@@ -28,9 +28,9 @@ type TerraformRepositorySpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	Repository          TerraformRepositoryRepository          `json:"repository,omitempty"`
-	RemediationStrategy TerraformRepositoryRemediationStrategy `json:"remediationStrategy,omitempty"`
-	OverrideRunnerSpec  OverrideRunnerSpec                     `json:"overrideRunnerSpec,omitempty"`
+	Repository          TerraformRepositoryRepository `json:"repository,omitempty"`
+	RemediationStrategy RemediationStrategy           `json:"remediationStrategy,omitempty"`
+	OverrideRunnerSpec  OverrideRunnerSpec            `json:"overrideRunnerSpec,omitempty"`
 }
 
 type TerraformRepositoryRepository struct {
@@ -43,13 +43,6 @@ type TerraformRepositoryStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 }
 
-type TerraformRepositoryRemediationStrategy struct {
-	PlanOnDrift  bool `json:"planOnDrift,omitempty"`
-	ApplyOnDrift bool `json:"applyOnDrift,omitempty"`
-	PlanOnPush   bool `json:"planOnPush,omitempty"`
-	ApplyOnPush  bool `json:"applyOnPush,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go