refactors use of generated code

Azure · May 15, 2024 · 18f3586 · 18f3586
1 parent 450b830
commit 18f3586
Show file tree

Hide file tree

Showing 25 changed files with 240 additions and 195 deletions.
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
@@ -16,7 +16,7 @@ npm ci
 
 # Install the tsp cli
 # pinned to the last working version combination
-npm install -g @typespec/compiler@0.55.0
+npm install -g @typespec/compiler@0.56.0
 
 # Install azure/oav for validation of openapi and swagger example generation
 # https://github.com/Azure/oav

diff --git a/api/autorest-config.yaml b/api/autorest-config.yaml
@@ -6,9 +6,8 @@ use:
 go:
   namespace: redhatopenshift
   project-folder: ../internal
-  output-folder: $(project-folder)/api/v20240610preview
-  file-prefix: generated
+  output-folder: $(project-folder)/api/v20240610preview/generated
   module-version: "0.0.1"
-  containing-module: "github.com/Azure/ARO-HCP/internal/api"
+  containing-module: "github.com/Azure/ARO-HCP/internal/api/v20240610preview"
   azure-arm: true
   generate-fakes: true
diff --git a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
@@ -28,7 +28,7 @@ model HcpOpenShiftClusterResource
   @segment("hcpOpenShiftClusters")
   name: string;
 
-  ...ManagedServiceIdentity;
+  ...ManagedServiceIdentityProperty;
 }
 
 // The NodePool needs to be TrackedResource for the following reasons:

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
@@ -2162,24 +2162,6 @@
         }
       }
     },
-    "Versions": {
-      "type": "string",
-      "description": "The available API versions.",
-      "enum": [
-        "2024-06-10-preview"
-      ],
-      "x-ms-enum": {
-        "name": "Versions",
-        "modelAsString": true,
-        "values": [
-          {
-            "name": "v2024_06_10_preview",
-            "value": "2024-06-10-preview",
-            "description": "2024-06-10-preview version"
-          }
-        ]
-      }
-    },
     "Visibility": {
       "type": "string",
       "description": "The visibility of the API server",

diff --git a/...240610preview/generated_client_factory.go → ...240610preview/generated/client_factory.go b/...240610preview/generated_client_factory.go → ...240610preview/generated/client_factory.go
diff --git a/...i/v20240610preview/generated_constants.go → ...i/v20240610preview/generated/constants.go b/...i/v20240610preview/generated_constants.go → ...i/v20240610preview/generated/constants.go
diff --git a/...ted_hcpclusterversionoperations_server.go → ...ake/hcpclusterversionoperations_server.go b/...ted_hcpclusterversionoperations_server.go → ...ake/hcpclusterversionoperations_server.go
diff --git a/.../generated_hcpopenshiftclusters_server.go → ...rated/fake/hcpopenshiftclusters_server.go b/.../generated_hcpopenshiftclusters_server.go → ...rated/fake/hcpopenshiftclusters_server.go
diff --git a/...0240610preview/fake/generated_internal.go → ...0240610preview/generated/fake/internal.go b/...0240610preview/fake/generated_internal.go → ...0240610preview/generated/fake/internal.go