rpk yaml: omitempty on empty CloudCluster's

This makes the yaml look a bit nicer. Also updates the yaml sha, sticking with v3 since v3 is introduced in this PR.
redpanda-data · Mar 15, 2024 · eb31bb0 · eb31bb0
1 parent 967ccf9
commit eb31bb0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 38 deletions.
diff --git a/src/go/rpk/pkg/config/params_test.go b/src/go/rpk/pkg/config/params_test.go
@@ -741,12 +741,6 @@ profiles:
       description: Default rpk profile
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 127.0.0.1:9092
@@ -839,12 +833,6 @@ profiles:
       description: Default rpk profile
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 0.0.0.3:9092
@@ -887,12 +875,6 @@ profiles:
       description: descriptosphere
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 0.0.0.3
@@ -950,12 +932,6 @@ profiles:
       description: descriptosphere
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 0.0.0.3:9092
@@ -1017,12 +993,6 @@ profiles:
       description: descriptosphere
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 128.0.0.4
@@ -1073,12 +1043,6 @@ profiles:
       description: descriptosphere
       prompt: ""
       from_cloud: false
-      cloud_cluster:
-        namespace: ""
-        cluster_id: ""
-        cluster_name: ""
-        auth_org_id: ""
-        auth_kind: ""
       kafka_api:
         brokers:
             - 128.0.0.4:9092

diff --git a/src/go/rpk/pkg/config/rpk_yaml.go b/src/go/rpk/pkg/config/rpk_yaml.go
@@ -137,7 +137,7 @@ type (
 		Description  string               `json:"description" yaml:"description"`
 		Prompt       string               `json:"prompt" yaml:"prompt"`
 		FromCloud    bool                 `json:"from_cloud" yaml:"from_cloud"`
-		CloudCluster RpkCloudCluster      `json:"cloud_cluster" yaml:"cloud_cluster"`
+		CloudCluster RpkCloudCluster      `json:"cloud_cluster,omitempty" yaml:"cloud_cluster,omitempty"`
 		KafkaAPI     RpkKafkaAPI          `json:"kafka_api" yaml:"kafka_api"`
 		AdminAPI     RpkAdminAPI          `json:"admin_api" yaml:"admin_api"`
 		SR           RpkSchemaRegistryAPI `json:"schema_registry" yaml:"schema_registry"`

diff --git a/src/go/rpk/pkg/config/rpk_yaml_test.go b/src/go/rpk/pkg/config/rpk_yaml_test.go
@@ -25,7 +25,7 @@ func TestRpkYamlVersion(t *testing.T) {
 	shastr := hex.EncodeToString(sha[:])
 
 	const (
-		v3sha = "36be33e2fc1063d4522310f61e33f6c75bd597532e8d810066525616e9e8d845" // 24-04-14
+		v3sha = "cc2faa9790df9307d1fbf3e532128152d473e31a951152d2e2514a915269f880" // 24-04-14
 	)
 
 	if shastr != v3sha {