Fix cortex cluster info cmd (#2150)

Author: RobertLucian

pkg/types/clusterconfig/cluster_config.go

@@ -641,14 +641,6 @@ var ManagedConfigStructFieldValidations = []*cr.StructFieldValidation{
 			AllowExplicitNull: true,
 		},
 	},
-	{
-		StructField: "CortexPolicyARN",
-		StringValidation: &cr.StringValidation{
-			Required:         false,
-			AllowEmpty:       true,
-			TreatNullAsEmpty: true,
-		},
-	},
 	{
 		StructField: "IAMPolicyARNs",
 		StringListValidation: &cr.StringListValidation{
@@ -771,6 +763,22 @@ var ManagedConfigStructFieldValidations = []*cr.StructFieldValidation{
 			Validator: validateCIDR,
 		},
 	},
+	{
+		StructField: "CortexPolicyARN",
+		StringValidation: &cr.StringValidation{
+			Required:         false,
+			AllowEmpty:       true,
+			TreatNullAsEmpty: true,
+		},
+	},
+	{
+		StructField: "AccountID",
+		StringValidation: &cr.StringValidation{
+			Required:         false,
+			AllowEmpty:       true,
+			TreatNullAsEmpty: true,
+		},
+	},
 }
 
 func CoreConfigValidations(allowExtraFields bool) *cr.StructValidation {
@@ -903,6 +911,11 @@ func (cc *Config) Validate(awsClient *aws.Client) error {
 		return err
 	}
 
+	if cc.AccountID != "" {
+		return ErrorDisallowedField(AccountIDKey)
+	}
+	cc.AccountID = accountID
+
 	if cc.Bucket == "" {
 		bucketID := hash.String(accountID + cc.Region)[:8] // this is to "guarantee" a globally unique name
 		cc.Bucket = cc.ClusterName + "-" + bucketID
@@ -913,6 +926,9 @@ func (cc *Config) Validate(awsClient *aws.Client) error {
 		}
 	}
 
+	if cc.CortexPolicyARN != "" {
+		return ErrorDisallowedField(CortexPolicyARNKey)
+	}
 	cc.CortexPolicyARN = DefaultPolicyARN(accountID, cc.ClusterName, cc.Region)
 
 	defaultPoliciesSet := strset.New(_defaultIAMPolicies...)

pkg/types/clusterconfig/config_key.go

@@ -53,5 +53,6 @@ const (
 	APILoadBalancerSchemeKey               = "api_load_balancer_scheme"
 	OperatorLoadBalancerSchemeKey          = "operator_load_balancer_scheme"
 	VPCCIDRKey                             = "vpc_cidr"
+	AccountIDKey                           = "account_id"
 	TelemetryKey                           = "telemetry"
 )

pkg/types/clusterconfig/errors.go

@@ -29,8 +29,9 @@ import (
 
 const (
 	ErrInvalidProvider                        = "clusterconfig.invalid_provider"
-	ErrInvalidLegacyProvider                  = "cli.invalid_legacy_provider"
+	ErrInvalidLegacyProvider                  = "clusterconfig.invalid_legacy_provider"
 	ErrInvalidRegion                          = "clusterconfig.invalid_region"
+	ErrDisallowedField                        = "clusterconfig.disallowed_field"
 	ErrNoNodeGroupSpecified                   = "clusterconfig.no_nodegroup_specified"
 	ErrNodeGroupMaxInstancesIsZero            = "clusterconfig.node_group_max_instances_is_zero"
 	ErrMaxNumOfNodeGroupsReached              = "clusterconfig.max_num_of_nodegroups_reached"
@@ -88,6 +89,13 @@ func ErrorInvalidLegacyProvider(providerStr string) error {
 	})
 }
 
+func ErrorDisallowedField(field string) error {
+	return errors.WithStack(&errors.Error{
+		Kind:    ErrDisallowedField,
+		Message: fmt.Sprintf("the %s field cannot be configured by the user", field),
+	})
+}
+
 func ErrorInvalidRegion(region string) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrInvalidRegion,