Merge pull request #111 from bennerv/fixup-nsg

Update preconfiguredNSG to networkSecurityGroupID
Azure · May 8, 2024 · ceb1014 · ceb1014
2 parents 270da4a + c2a0ac8
commit ceb1014
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
@@ -258,8 +258,8 @@ model PlatformProfile {
   /** The core outgoing configuration */
   outboundType?: OutboundType = OutboundType.loadBalancer;
 
-  /** Specifies whether subnets are pre-attached with an NSG */
-  preconfiguredNsgs: boolean;
+  /** ResourceId for the network security group attached to the cluster subnet */
+  networkSecurityGroupId: string;
 
   /** The id of the disk encryption set to be used for etcd.
    * Configure this when `etcdEncryption` is set to true

diff --git a/...nshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json b/...nshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json
@@ -1984,9 +1984,9 @@
             ]
           }
         },
-        "preconfiguredNsgs": {
-          "type": "boolean",
-          "description": "Specifies whether subnets are pre-attached with an NSG"
+        "networkSecurityGroupId": {
+          "type": "string",
+          "description": "ResourceId for the network security group attached to the cluster subnet"
         },
         "etcdEncryptionSetId": {
           "type": "string",
@@ -1996,7 +1996,7 @@
       "required": [
         "managedResourceGroup",
         "subnetId",
-        "preconfiguredNsgs"
+        "networkSecurityGroupId"
       ]
     },
     "ProvisioningState": {

diff --git a/internal/api/hcpopenshiftcluster.go b/internal/api/hcpopenshiftcluster.go
@@ -89,8 +89,9 @@ type PlatformProfile struct {
 	ManagedResourceGroup string       `json:"managedResourceGroup,omitempty" validate:"required_for_put"`
 	SubnetID             string       `json:"subnetId,omitempty"             validate:"required_for_put"`
 	OutboundType         OutboundType `json:"outboundType,omitempty"         validate:"omitempty,enum_outboundtype"`
-	PreconfiguredNSGs    bool         `json:"preconfiguredNsgs,omitempty"`
-	EtcdEncryptionSetID  string       `json:"etcdEncryptionSetId,omitempty"`
+	//TODO: Is nsg required for PUT, or will we create if not specified?
+	NetworkSecurityGroupID string `json:"networkSecurityGroupId,omitempty" validate:"required_for_put"`
+	EtcdEncryptionSetID    string `json:"etcdEncryptionSetId,omitempty"`
 }
 
 // ExternalAuthConfigProfile represents the external authentication configuration.

diff --git a/internal/api/v20240610preview/generated_models.go b/internal/api/v20240610preview/generated_models.go
diff --git a/internal/api/v20240610preview/generated_models_serde.go b/internal/api/v20240610preview/generated_models_serde.go
diff --git a/internal/api/v20240610preview/hcpopenshiftclusters_methods.go b/internal/api/v20240610preview/hcpopenshiftclusters_methods.go
@@ -62,11 +62,11 @@ func newProxyProfile(from *api.ProxyProfile) *ProxyProfile {
 
 func newPlatformProfile(from *api.PlatformProfile) *PlatformProfile {
 	return &PlatformProfile{
-		ManagedResourceGroup: api.Ptr(from.ManagedResourceGroup),
-		SubnetID:             api.Ptr(from.SubnetID),
-		OutboundType:         api.Ptr(OutboundType(from.OutboundType)),
-		PreconfiguredNsgs:    api.Ptr(from.PreconfiguredNSGs),
-		EtcdEncryptionSetID:  api.Ptr(from.EtcdEncryptionSetID),
+		ManagedResourceGroup:   api.Ptr(from.ManagedResourceGroup),
+		SubnetID:               api.Ptr(from.SubnetID),
+		OutboundType:           api.Ptr(OutboundType(from.OutboundType)),
+		NetworkSecurityGroupID: api.Ptr(from.NetworkSecurityGroupID),
+		EtcdEncryptionSetID:    api.Ptr(from.EtcdEncryptionSetID),
 	}
 }
 
@@ -407,8 +407,8 @@ func (p *PlatformProfile) Normalize(out *api.PlatformProfile) {
 	if p.OutboundType != nil {
 		out.OutboundType = api.OutboundType(*p.OutboundType)
 	}
-	if p.PreconfiguredNsgs != nil {
-		out.PreconfiguredNSGs = *p.PreconfiguredNsgs
+	if p.NetworkSecurityGroupID != nil {
+		out.NetworkSecurityGroupID = *p.NetworkSecurityGroupID
 	}
 	if p.EtcdEncryptionSetID != nil {
 		out.EtcdEncryptionSetID = *p.EtcdEncryptionSetID