Use *VarFileFormat pointer as per API conventions

Signed-off-by: Yury Tsarev <yury.tsarev@absa.africa>
upbound · Jan 20, 2022 · a5ff90d · a5ff90d
1 parent 1dae613
commit a5ff90d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/apis/v1alpha1/workspace_types.go b/apis/v1alpha1/workspace_types.go
@@ -43,7 +43,7 @@ const (
 type VarFileFormat string
 
 // Vars file formats.
-const (
+var (
 	VarFileFormatHCL  VarFileFormat = "HCL"
 	VarFileFormatJSON VarFileFormat = "JSON"
 )
@@ -56,7 +56,7 @@ type VarFile struct {
 	// Format of this vars file.
 	// +kubebuilder:default=HCL
 	// +optional
-	Format VarFileFormat `json:"format"`
+	Format *VarFileFormat `json:"format,omitempty"`
 
 	// A ConfigMap key containing the vars file.
 	// +optional

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/internal/controller/workspace/workspace.go b/internal/controller/workspace/workspace.go
@@ -324,7 +324,7 @@ func (c *external) options(ctx context.Context, p v1alpha1.WorkspaceParameters)
 
 	for _, vf := range p.VarFiles {
 		fmt := terraform.HCL
-		if vf.Format == v1alpha1.VarFileFormatJSON {
+		if vf.Format == &v1alpha1.VarFileFormatJSON {
 			fmt = terraform.JSON
 		}
 

diff --git a/internal/controller/workspace/workspace_test.go b/internal/controller/workspace/workspace_test.go
@@ -826,7 +826,7 @@ func TestCreate(t *testing.T) {
 								{
 									Source:             v1alpha1.VarFileSourceSecretKey,
 									SecretKeyReference: &v1alpha1.KeyReference{},
-									Format:             v1alpha1.VarFileFormatJSON,
+									Format:             &v1alpha1.VarFileFormatJSON,
 								},
 							},
 						},
@@ -975,7 +975,7 @@ func TestDelete(t *testing.T) {
 								{
 									Source:             v1alpha1.VarFileSourceSecretKey,
 									SecretKeyReference: &v1alpha1.KeyReference{},
-									Format:             v1alpha1.VarFileFormatJSON,
+									Format:             &v1alpha1.VarFileFormatJSON,
 								},
 							},
 						},