tools/importer-rest-api-specs: refactoring the Parser package

.github/workflows/unit-test-end-to-end-resource-manager.yaml

@@ -6,6 +6,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'config/**'
+      - 'tools/importer-rest-api-specs/**'
 
 jobs:
   test:
@@ -32,4 +33,4 @@ jobs:
       - name: "Run the Go SDK Generator"
         run: |
           # go go gadget generator
-          ./scripts/automation-generate-go-sdk.sh
+          ./scripts/automation-generate-go-sdk.sh resource-manager

scripts/automation-generate-go-sdk.sh

@@ -6,6 +6,23 @@
 set -e
 
 DIR="$(cd "$(dirname "$0")" && pwd)/.."
+sourceDataType="${1}"
+
+usage() {
+  echo "Usage: automation-generate-go-sdk.sh sourceDataType" >&2
+  echo "" >&2
+  echo "sourceDataType is required and should be one of:" >&2
+  echo "  microsoft-graph" >&2
+  echo "  resource-manager" >&2
+  echo "" >&2
+}
+
+if [[ "${sourceDataType}" == "" ]]; then
+  echo "sourceDataType not specified" >&2
+  echo "" >&2
+  usage
+  exit 1
+fi
 
 function buildAndInstallDependencies {
   echo "Outputting Go Version.."
@@ -31,15 +48,9 @@ function runWrapper {
   local apiDefinitionsDirectory=$1
   local outputDirectory=$2
 
-  echo "Running Wrapper for Resource Manager.."
-  cd "${DIR}/tools/wrapper-automation"
-  ./wrapper-automation resource-manager go-sdk \
-    --api-definitions-dir="../../$apiDefinitionsDirectory"\
-    --output-dir="../../$outputDirectory"
-
-  echo "Running Wrapper for Microsoft Graph.."
+  echo "Running Wrapper.."
   cd "${DIR}/tools/wrapper-automation"
-  ./wrapper-automation microsoft-graph go-sdk \
+  ./wrapper-automation "${sourceDataType}" go-sdk \
     --api-definitions-dir="../../$apiDefinitionsDirectory"\
     --output-dir="../../$outputDirectory"
 

tools/data-api-sdk/v1/helpers/inner_most_operation_object_definition.go

@@ -0,0 +1,21 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package helpers
+
+import "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
+
+// InnerMostSDKOperationOptionObjectDefinition returns the inner most SDKOperationOptionObjectDefinition.
+//
+// In the event of an SDKOperationOptionObjectDefinition with no NestedItem, the current item will be returned.
+// In the event of a NestedItem being present, or a NestedItem having a NestedItem, this method
+// will recurse until it finds the SDKOperationOptionObjectDefinition without a NestedItem.
+//
+// This is useful for obtaining the inner type for assignment purposes.
+func InnerMostSDKOperationOptionObjectDefinition(input models.SDKOperationOptionObjectDefinition) models.SDKOperationOptionObjectDefinition {
+	if input.NestedItem != nil {
+		return InnerMostSDKOperationOptionObjectDefinition(*input.NestedItem)
+	}
+
+	return input
+}

tools/data-api-sdk/v1/models/sdk_object_definition.go

@@ -22,7 +22,7 @@ type SDKObjectDefinition struct {
 	ReferenceName *string `json:"referenceName,omitempty"`
 
 	// ReferenceNameIsCommonType specifies whether the referenced Constant or Model is a common type
-	ReferenceNameIsCommonType *bool `json:"referenceNameIsCommonType,omitempty"`
+	ReferenceNameIsCommonType bool `json:"referenceNameIsCommonType"`
 
 	// Type specifies the Type that represents this SDK Object Definition. This can be either a
 	// Simple type (e.g. a String/Integer), a Reference to a Constant/Model or a more complex object

tools/importer-rest-api-specs/GNUmakefile

@@ -16,6 +16,9 @@ import: build
 import-with-api: build
 	./importer-rest-api-specs import --data-api=http://localhost:8080
 
+validate: build
+	./importer-rest-api-specs validate
+
 test: build
 	go test -v ./... -timeout=60m