importer-msgraph-metadata: support OData Metadata parameter

hashicorp · Sep 12, 2024 · 63aa605 · 63aa605
1 parent 51de4a5
commit 63aa605
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/tools/importer-msgraph-metadata/components/parser/resources.go b/tools/importer-msgraph-metadata/components/parser/resources.go
@@ -143,6 +143,7 @@ type Resources map[string]*Resource
 
 // ServiceHasValidResources returns true when resources are found for the provided serviceName that have usable operations
 // defined (specifically any operations that do not require a response model, or that have a response model for any response)
+// TODO: maybe remove this, we are not using this as it's preferable to error out rather than skip over
 func (r Resources) ServiceHasValidResources(serviceName string) bool {
 	for _, resource := range r {
 		if resource.Category == "" {

diff --git a/tools/importer-msgraph-metadata/internal/pipeline/task_translate_service.go b/tools/importer-msgraph-metadata/internal/pipeline/task_translate_service.go
@@ -90,15 +90,22 @@ func (p pipelineForService) translateServiceToDataApiSdkTypes() (*sdkModels.Serv
 				}
 			}
 
-			options := make(map[string]sdkModels.SDKOperationOption)
+			options := map[string]sdkModels.SDKOperationOption{
+				"Metadata": {
+					ODataFieldName: pointer.To("Metadata"),
+					ObjectDefinition: sdkModels.SDKOperationOptionObjectDefinition{
+						ReferenceName: pointer.To("odata.Metadata"),
+						Type:          sdkModels.ReferenceSDKOperationOptionObjectDefinitionType,
+					},
+				},
+			}
 
 			if operation.RequestHeaders != nil {
 				for _, header := range *operation.RequestHeaders {
 					if strings.EqualFold(header.Name, "ConsistencyLevel") {
 						options[normalize.CleanName(header.Name)] = sdkModels.SDKOperationOption{
 							ODataFieldName: &header.Name,
 							ObjectDefinition: sdkModels.SDKOperationOptionObjectDefinition{
-								NestedItem:    nil,
 								ReferenceName: pointer.To("odata.ConsistencyLevel"),
 								Type:          sdkModels.ReferenceSDKOperationOptionObjectDefinitionType,
 							},
@@ -139,7 +146,6 @@ func (p pipelineForService) translateServiceToDataApiSdkTypes() (*sdkModels.Serv
 						options["Expand"] = sdkModels.SDKOperationOption{
 							ODataFieldName: pointer.To("Expand"),
 							ObjectDefinition: sdkModels.SDKOperationOptionObjectDefinition{
-								NestedItem:    nil,
 								ReferenceName: pointer.To("odata.Expand"),
 								Type:          sdkModels.ReferenceSDKOperationOptionObjectDefinitionType,
 							},
@@ -149,7 +155,6 @@ func (p pipelineForService) translateServiceToDataApiSdkTypes() (*sdkModels.Serv
 						options["Format"] = sdkModels.SDKOperationOption{
 							ODataFieldName: pointer.To("Format"),
 							ObjectDefinition: sdkModels.SDKOperationOptionObjectDefinition{
-								NestedItem:    nil,
 								ReferenceName: pointer.To("odata.Format"),
 								Type:          sdkModels.ReferenceSDKOperationOptionObjectDefinitionType,
 							},
@@ -159,7 +164,6 @@ func (p pipelineForService) translateServiceToDataApiSdkTypes() (*sdkModels.Serv
 						options["OrderBy"] = sdkModels.SDKOperationOption{
 							ODataFieldName: pointer.To("OrderBy"),
 							ObjectDefinition: sdkModels.SDKOperationOptionObjectDefinition{
-								NestedItem:    nil,
 								ReferenceName: pointer.To("odata.OrderBy"),
 								Type:          sdkModels.ReferenceSDKOperationOptionObjectDefinitionType,
 							},