Merge pull request #2516 from 2uasimojo/HIVE-2214/valueJSON-string

BREAKING: make `PatchEntity.ValueJSON` a `string`
openshift · Nov 11, 2024 · 85c2c4f · 85c2c4f
2 parents 00f84cc + 4eaf5fd
commit 85c2c4f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 23 deletions.
diff --git a/apis/hive/v1/clusterdeploymentcustomization_types.go b/apis/hive/v1/clusterdeploymentcustomization_types.go
@@ -64,7 +64,7 @@ type PatchEntity struct {
 	// ValueJSON is a string representing a JSON object to be used in the operation. As such,
 	// internal quotes must be escaped. If nonempty, Value is ignored.
 	// +optional
-	ValueJSON []byte `json:"valueJSON,omitempty"`
+	ValueJSON string `json:"valueJSON,omitempty"`
 }
 
 // Encode returns a string representation of the RFC6902 patching operation represented by the
@@ -74,7 +74,7 @@ func (pe *PatchEntity) Encode() string {
 	// Prefer ValueJSON
 	if len(pe.ValueJSON) != 0 {
 		// ValueJSON will be a raw JSON object in the patch; don't quote it.
-		val = string(pe.ValueJSON)
+		val = pe.ValueJSON
 	} else {
 		// Value will be a JSON string value in the patch; quote it.
 		val = fmt.Sprintf("%q", pe.Value)

diff --git a/apis/hive/v1/zz_generated.deepcopy.go b/apis/hive/v1/zz_generated.deepcopy.go
diff --git a/config/crds/hive.openshift.io_clusterdeploymentcustomizations.yaml b/config/crds/hive.openshift.io_clusterdeploymentcustomizations.yaml
@@ -73,7 +73,6 @@ spec:
                       description: |-
                         ValueJSON is a string representing a JSON object to be used in the operation. As such,
                         internal quotes must be escaped. If nonempty, Value is ignored.
-                      format: byte
                       type: string
                   required:
                   - op

diff --git a/hack/app-sre/saas-template.yaml b/hack/app-sre/saas-template.yaml
@@ -370,7 +370,6 @@ objects:
                           to be used in the operation. As such,
 
                           internal quotes must be escaped. If nonempty, Value is ignored.'
-                        format: byte
                         type: string
                     required:
                     - op

diff --git a/pkg/installmanager/installmanager.go b/pkg/installmanager/installmanager.go
@@ -1081,7 +1081,7 @@ func patchWorkerMachineSetManifest(manifestBytes []byte, pool *hivev1.MachinePoo
 			{
 				Op:        "add",
 				Path:      fmt.Sprintf("/spec/template/spec/providerSpec/value/securityGroups/%d/filters/-", idx),
-				ValueJSON: vpcIDFilterValueJSON,
+				ValueJSON: string(vpcIDFilterValueJSON),
 			},
 		}
 	}

diff --git a/vendor/github.com/openshift/hive/apis/hive/v1/clusterdeploymentcustomization_types.go b/vendor/github.com/openshift/hive/apis/hive/v1/clusterdeploymentcustomization_types.go
diff --git a/vendor/github.com/openshift/hive/apis/hive/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/hive/apis/hive/v1/zz_generated.deepcopy.go