importer-msgraph-metadata: global fix for inconsistent HTTP status co…

…des in responses

Additionally, internally, collapse `Responses: []Response` into the
`Operation` struct, to better model the Data API SDK types, as we
are only ever using a single `Response`.

tools/importer-msgraph-metadata/components/parser/resources.go

@@ -52,6 +52,10 @@ type Operation struct {
 	// The remainder of the URI after the resource ID
 	UriSuffix *string
 
+	// When the content type is JSON or XML, and this is a List operation, the name of the field
+	// that specifies a URL to retrieve the next page of results
+	PaginationField *string
+
 	// The content-type of the request body
 	RequestContentType *string
 
@@ -71,35 +75,26 @@ type Operation struct {
 	// and the request is not described by a model
 	RequestType *DataType
 
-	// The expected *success* responses for this operation
-	Responses []Response
-
-	// When the content type is JSON or XML, and this is a List operation, the name of the field
-	// that specifies a URL to retrieve the next page of results
-	PaginationField *string
-
-	// OpenAPI3 tags for this operation, used to reconcile operations to services
-	Tags []string
-}
-
-type Response struct {
-	// The HTTP status code associated with this expected response
-	Status int
+	// The HTTP status codes associated with this expected response
+	ResponseStatusCodes []int
 
 	// The expected content type for this resource
-	ContentType *string
+	ResponseContentType *string
 
 	// Specifies a referenced model or constant for the response, noting that this
 	// should be the full type name from the spec prior to normalizing
-	ReferenceName *string
+	ResponseReferenceName *string
 
 	// The internal data type for the response, used when the content type is JSON or XML,
 	// and the response is not described by a model
-	Type *DataType
+	ResponseType *DataType
 
 	// Model and Constant are used internally for ad-hoc response models
-	Model    *Model
-	Constant *Constant
+	ResponseModel    *Model
+	ResponseConstant *Constant
+
+	// OpenAPI3 tags for this operation, used to reconcile operations to services
+	Tags []string
 }
 
 type Header struct {

tools/importer-msgraph-metadata/components/workarounds/workaround_synchronizationsecrets.go

@@ -57,22 +57,18 @@ func (workaroundSynchronizationSecrets) Process(apiVersion, serviceName string,
 		}
 
 		resource.Operations = append(resource.Operations, parser.Operation{
-			Name:            "ListSynchronizationSecrets",
-			Description:     "Retrieve synchronization secrets.",
-			Type:            parser.OperationTypeList,
-			Method:          http.MethodGet,
-			PaginationField: pointer.To("@odata.nextLink"),
-			ResourceId:      resourceId,
-			UriSuffix:       uriSuffix,
-			Responses: []parser.Response{
-				{
-					Status:        http.StatusOK,
-					ContentType:   pointer.To("application/json"),
-					ReferenceName: pointer.To("microsoft.graph.synchronizationSecretKeyStringValuePair"),
-					Type:          pointer.To(parser.DataTypeReference),
-				},
-			},
-			Tags: tags,
+			Name:                  "ListSynchronizationSecrets",
+			Description:           "Retrieve synchronization secrets.",
+			Type:                  parser.OperationTypeList,
+			Method:                http.MethodGet,
+			PaginationField:       pointer.To("@odata.nextLink"),
+			ResourceId:            resourceId,
+			UriSuffix:             uriSuffix,
+			ResponseStatusCodes:   []int{http.StatusOK},
+			ResponseContentType:   pointer.To("application/json"),
+			ResponseReferenceName: pointer.To("microsoft.graph.synchronizationSecretKeyStringValuePair"),
+			ResponseType:          pointer.To(parser.DataTypeReference),
+			Tags:                  tags,
 		})
 	}
 

tools/importer-msgraph-metadata/components/workarounds/workarounds.go

@@ -32,10 +32,6 @@ var serviceWorkarounds = []serviceWorkaround{
 	workaroundBlacklist{},
 
 	// Service-specific workarounds
-	workaroundApplicationTemplates{},
-	workaroundEntitlementManagementAccessPackageAccessPackageResourceRoleScope{},
-	workaroundEntitlementManagementRoleAssignment{},
-	workaroundGroups{},
 	workaroundSynchronizationSecrets{},
 }