Update serializer to remove unused async fields (#12517)

GoogleCloudPlatform · Jan 24, 2025 · 22c37cf · 22c37cf
1 parent fc8e41c
commit 22c37cf
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 67 deletions.
diff --git a/mmv1/api/async.go b/mmv1/api/async.go
@@ -17,7 +17,6 @@ import (
 	"log"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/magic-modules/mmv1/google"
 	"golang.org/x/exp/slices"
 )
 
@@ -72,52 +71,21 @@ func NewAsync() *Async {
 type OpAsync struct {
 	Result OpAsyncResult
 
-	Status OpAsyncStatus `yaml:"status,omitempty"`
-
-	Error OpAsyncError
-
 	// If true, include project as an argument to OperationWaitTime.
 	// It is intended for resources that calculate project/region from a selflink field
 	IncludeProject bool `yaml:"include_project"`
 }
 
 type OpAsyncOperation struct {
-	Kind string `yaml:"kind,omitempty"`
-
-	Path string `yaml:"path,omitempty"`
-
 	BaseUrl string `yaml:"base_url,omitempty"`
 
-	WaitMs int `yaml:"wait_ms,omitempty"`
-
 	// Use this if the resource includes the full operation url.
 	FullUrl string `yaml:"full_url,omitempty"`
 }
 
 // Represents the results of an Operation request
 type OpAsyncResult struct {
 	ResourceInsideResponse bool `yaml:"resource_inside_response,omitempty"`
-
-	Path string `yaml:"path,omitempty"`
-}
-
-// Provides information to parse the result response to check operation
-// status
-type OpAsyncStatus struct {
-	Path string `yaml:"path,omitempty"`
-
-	Complete bool `yaml:"complete,omitempty"`
-
-	Allowed []bool `yaml:"allowed,omitempty"`
-}
-
-// Provides information on how to retrieve errors of the executed operations
-type OpAsyncError struct {
-	google.YamlValidator `yaml:"-"`
-
-	Path string `yaml:"path,omitempty"`
-
-	Message string `yaml:"message,omitempty"`
 }
 
 // Async implementation for polling in Terraform

diff --git a/mmv1/products/apihub/ApiHubInstance.yaml b/mmv1/products/apihub/ApiHubInstance.yaml
@@ -53,7 +53,6 @@ async:
   type: OpAsync
   result:
     resource_inside_response: true
-  error: {}
   include_project: false
 autogen_status: QXBpSHViSW5zdGFuY2U=
 parameters:

diff --git a/mmv1/products/beyondcorp/SecurityGateway.yaml b/mmv1/products/beyondcorp/SecurityGateway.yaml
@@ -42,7 +42,6 @@ async:
   type: OpAsync
   result:
     resource_inside_response: true
-  error: {}
   include_project: false
 autogen_status: U2VjdXJpdHlHYXRld2F5
 parameters:

diff --git a/mmv1/products/developerconnect/Connection.yaml b/mmv1/products/developerconnect/Connection.yaml
@@ -84,7 +84,6 @@ async:
   type: OpAsync
   result:
     resource_inside_response: true
-  error: {}
   include_project: false
 autogen_status: Q29ubmVjdGlvbg==
 parameters:

diff --git a/mmv1/products/edgenetwork/InterconnectAttachment.yaml b/mmv1/products/edgenetwork/InterconnectAttachment.yaml
@@ -37,14 +37,8 @@ async:
   type: 'OpAsync'
   operation:
     base_url: '{{op_id}}'
-    path: 'name'
-    wait_ms: 1000
   result:
-    path: 'response'
     resource_inside_response: false
-  error:
-    path: 'error'
-    message: 'message'
 examples:
   - name: 'edgenetwork_interconnect_attachment'
     primary_resource_id: 'example_interconnect_attachment'

diff --git a/mmv1/products/gkeonprem/VmwareAdminCluster.yaml b/mmv1/products/gkeonprem/VmwareAdminCluster.yaml
@@ -24,7 +24,7 @@ description: "A Google VMware Admin Cluster."
 exclude_delete: true
 id_format: "projects/{{project}}/locations/{{location}}/vmwareAdminClusters/{{name}}"
 import_format: ["projects/{{project}}/locations/{{location}}/vmwareAdminClusters/{{name}}"]
-timeouts: !ruby/object:Api::Timeouts
+timeouts:
   insert_minutes: 60
   delete_minutes: 60
   update_minutes: 60
@@ -33,15 +33,8 @@ async:
   type: 'OpAsync'
   operation:
     base_url: '{{op_id}}'
-    kind: 'gkeonprem#operation'
-    path: 'name'
-    wait_ms: 1000
   result:
-    path: 'response'
     resource_inside_response: true
-  error:
-    path: 'error'
-    message: 'message'
 custom_code:
 taint_resource_on_failed_create: true
 examples:

diff --git a/mmv1/products/networksecurity/InterceptDeployment.yaml b/mmv1/products/networksecurity/InterceptDeployment.yaml
@@ -34,14 +34,8 @@ async:
   type: 'OpAsync'
   operation:
     base_url: '{{op_id}}'
-    path: 'name'
-    wait_ms: 1000
   result:
-    path: 'response'
     resource_inside_response: true
-  error:
-    path: 'error'
-    message: 'message'
 custom_code:
 examples:
   - name: 'network_security_intercept_deployment_basic'

diff --git a/mmv1/products/networksecurity/InterceptEndpointGroup.yaml b/mmv1/products/networksecurity/InterceptEndpointGroup.yaml
@@ -34,14 +34,8 @@ async:
   type: 'OpAsync'
   operation:
     base_url: '{{op_id}}'
-    path: 'name'
-    wait_ms: 1000
   result:
-    path: 'response'
     resource_inside_response: true
-  error:
-    path: 'error'
-    message: 'message'
 custom_code:
 examples:
   - name: 'network_security_intercept_endpoint_group_basic'

diff --git a/mmv1/products/networksecurity/InterceptEndpointGroupAssociation.yaml b/mmv1/products/networksecurity/InterceptEndpointGroupAssociation.yaml
@@ -34,14 +34,8 @@ async:
   type: 'OpAsync'
   operation:
     base_url: '{{op_id}}'
-    path: 'name'
-    wait_ms: 1000
   result:
-    path: 'response'
     resource_inside_response: true
-  error:
-    path: 'error'
-    message: 'message'
 custom_code:
 examples:
   - name: 'network_security_intercept_endpoint_group_association_basic'