feat: restore operation ids to remove "-in-workspace", and added requires replacement if changed

Author: VarunAthreya

.speakeasy/gen.lock

@@ -32,7 +32,7 @@ Gateway Custom Plugin Resource
 - `route` (Attributes) If set, the plugin will only activate when receiving requests via the specified route. Leave unset for the plugin to activate regardless of the Route being used. (see [below for nested schema](#nestedatt--route))
 - `service` (Attributes) If set, the plugin will only activate when receiving requests via one of the routes belonging to the specified Service. Leave unset for the plugin to activate regardless of the Service being matched. (see [below for nested schema](#nestedatt--service))
 - `tags` (List of String) An optional set of strings associated with the Plugin for grouping and filtering.
-- `workspace` (String) The name of the workspace. Default: "default"
+- `workspace` (String) The name of the workspace. Default: "default"; Requires replacement if changed.
 
 ### Read-Only
 

docs/resources/gateway_custom_plugin.md

@@ -156,13 +156,13 @@ func (r *GatewayACLResource) Create(ctx context.Context, req resource.CreateRequ
 		return
 	}
 
-	request, requestDiags := data.ToOperationsCreateACLWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsCreateACLWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.ACLs.CreateACLWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.ACLs.CreateACLWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -216,13 +216,13 @@ func (r *GatewayACLResource) Read(ctx context.Context, req resource.ReadRequest,
 		return
 	}
 
-	request, requestDiags := data.ToOperationsGetACLWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsGetACLWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.ACLs.GetACLWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.ACLs.GetACLWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -294,13 +294,13 @@ func (r *GatewayACLResource) Delete(ctx context.Context, req resource.DeleteRequ
 		return
 	}
 
-	request, requestDiags := data.ToOperationsDeleteACLWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsDeleteACLWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.ACLs.DeleteACLWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.ACLs.DeleteACLWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {

internal/provider/gatewayacl_resource.go

@@ -30,7 +30,7 @@ func (r *GatewayACLResourceModel) RefreshFromSharedACL(ctx context.Context, resp
 	return diags
 }
 
-func (r *GatewayACLResourceModel) ToOperationsCreateACLWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.CreateACLWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayACLResourceModel) ToOperationsCreateACLWithConsumerRequest(ctx context.Context) (*operations.CreateACLWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -49,7 +49,7 @@ func (r *GatewayACLResourceModel) ToOperationsCreateACLWithConsumerInWorkspaceRe
 		return nil, diags
 	}
 
-	out := operations.CreateACLWithConsumerInWorkspaceRequest{
+	out := operations.CreateACLWithConsumerRequest{
 		ControlPlaneID:    controlPlaneID,
 		ConsumerID:        consumerID,
 		Workspace:         workspace,
@@ -59,7 +59,7 @@ func (r *GatewayACLResourceModel) ToOperationsCreateACLWithConsumerInWorkspaceRe
 	return &out, diags
 }
 
-func (r *GatewayACLResourceModel) ToOperationsDeleteACLWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.DeleteACLWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayACLResourceModel) ToOperationsDeleteACLWithConsumerRequest(ctx context.Context) (*operations.DeleteACLWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -74,7 +74,7 @@ func (r *GatewayACLResourceModel) ToOperationsDeleteACLWithConsumerInWorkspaceRe
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.DeleteACLWithConsumerInWorkspaceRequest{
+	out := operations.DeleteACLWithConsumerRequest{
 		ControlPlaneID: controlPlaneID,
 		ConsumerID:     consumerID,
 		ACLID:          aclID,
@@ -84,7 +84,7 @@ func (r *GatewayACLResourceModel) ToOperationsDeleteACLWithConsumerInWorkspaceRe
 	return &out, diags
 }
 
-func (r *GatewayACLResourceModel) ToOperationsGetACLWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.GetACLWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayACLResourceModel) ToOperationsGetACLWithConsumerRequest(ctx context.Context) (*operations.GetACLWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -99,7 +99,7 @@ func (r *GatewayACLResourceModel) ToOperationsGetACLWithConsumerInWorkspaceReque
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.GetACLWithConsumerInWorkspaceRequest{
+	out := operations.GetACLWithConsumerRequest{
 		ControlPlaneID: controlPlaneID,
 		ConsumerID:     consumerID,
 		ACLID:          aclID,

internal/provider/gatewayacl_resource_sdk.go

@@ -165,13 +165,13 @@ func (r *GatewayBasicAuthResource) Create(ctx context.Context, req resource.Crea
 		return
 	}
 
-	request, requestDiags := data.ToOperationsCreateBasicAuthWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsCreateBasicAuthWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.BasicAuthCredentials.CreateBasicAuthWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.BasicAuthCredentials.CreateBasicAuthWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -225,13 +225,13 @@ func (r *GatewayBasicAuthResource) Read(ctx context.Context, req resource.ReadRe
 		return
 	}
 
-	request, requestDiags := data.ToOperationsGetBasicAuthWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsGetBasicAuthWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.BasicAuthCredentials.GetBasicAuthWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.BasicAuthCredentials.GetBasicAuthWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -303,13 +303,13 @@ func (r *GatewayBasicAuthResource) Delete(ctx context.Context, req resource.Dele
 		return
 	}
 
-	request, requestDiags := data.ToOperationsDeleteBasicAuthWithConsumerInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsDeleteBasicAuthWithConsumerRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.BasicAuthCredentials.DeleteBasicAuthWithConsumerInWorkspace(ctx, *request)
+	res, err := r.client.BasicAuthCredentials.DeleteBasicAuthWithConsumer(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {

internal/provider/gatewaybasicauth_resource.go

@@ -30,7 +30,7 @@ func (r *GatewayBasicAuthResourceModel) RefreshFromSharedBasicAuth(ctx context.C
 	return diags
 }
 
-func (r *GatewayBasicAuthResourceModel) ToOperationsCreateBasicAuthWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.CreateBasicAuthWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayBasicAuthResourceModel) ToOperationsCreateBasicAuthWithConsumerRequest(ctx context.Context) (*operations.CreateBasicAuthWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -49,7 +49,7 @@ func (r *GatewayBasicAuthResourceModel) ToOperationsCreateBasicAuthWithConsumerI
 		return nil, diags
 	}
 
-	out := operations.CreateBasicAuthWithConsumerInWorkspaceRequest{
+	out := operations.CreateBasicAuthWithConsumerRequest{
 		ControlPlaneID:          controlPlaneID,
 		ConsumerID:              consumerID,
 		Workspace:               workspace,
@@ -59,7 +59,7 @@ func (r *GatewayBasicAuthResourceModel) ToOperationsCreateBasicAuthWithConsumerI
 	return &out, diags
 }
 
-func (r *GatewayBasicAuthResourceModel) ToOperationsDeleteBasicAuthWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.DeleteBasicAuthWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayBasicAuthResourceModel) ToOperationsDeleteBasicAuthWithConsumerRequest(ctx context.Context) (*operations.DeleteBasicAuthWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -74,7 +74,7 @@ func (r *GatewayBasicAuthResourceModel) ToOperationsDeleteBasicAuthWithConsumerI
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.DeleteBasicAuthWithConsumerInWorkspaceRequest{
+	out := operations.DeleteBasicAuthWithConsumerRequest{
 		ControlPlaneID: controlPlaneID,
 		ConsumerID:     consumerID,
 		BasicAuthID:    basicAuthID,
@@ -84,7 +84,7 @@ func (r *GatewayBasicAuthResourceModel) ToOperationsDeleteBasicAuthWithConsumerI
 	return &out, diags
 }
 
-func (r *GatewayBasicAuthResourceModel) ToOperationsGetBasicAuthWithConsumerInWorkspaceRequest(ctx context.Context) (*operations.GetBasicAuthWithConsumerInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayBasicAuthResourceModel) ToOperationsGetBasicAuthWithConsumerRequest(ctx context.Context) (*operations.GetBasicAuthWithConsumerRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -99,7 +99,7 @@ func (r *GatewayBasicAuthResourceModel) ToOperationsGetBasicAuthWithConsumerInWo
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.GetBasicAuthWithConsumerInWorkspaceRequest{
+	out := operations.GetBasicAuthWithConsumerRequest{
 		ControlPlaneID: controlPlaneID,
 		ConsumerID:     consumerID,
 		BasicAuthID:    basicAuthID,

internal/provider/gatewaybasicauth_resource_sdk.go

@@ -140,13 +140,13 @@ func (r *GatewayCACertificateResource) Create(ctx context.Context, req resource.
 		return
 	}
 
-	request, requestDiags := data.ToOperationsCreateCaCertificateInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsCreateCaCertificateRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.CACertificates.CreateCaCertificateInWorkspace(ctx, *request)
+	res, err := r.client.CACertificates.CreateCaCertificate(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -200,13 +200,13 @@ func (r *GatewayCACertificateResource) Read(ctx context.Context, req resource.Re
 		return
 	}
 
-	request, requestDiags := data.ToOperationsGetCaCertificateInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsGetCaCertificateRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.CACertificates.GetCaCertificateInWorkspace(ctx, *request)
+	res, err := r.client.CACertificates.GetCaCertificate(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -254,13 +254,13 @@ func (r *GatewayCACertificateResource) Update(ctx context.Context, req resource.
 		return
 	}
 
-	request, requestDiags := data.ToOperationsUpsertCaCertificateInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsUpsertCaCertificateRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.CACertificates.UpsertCaCertificateInWorkspace(ctx, *request)
+	res, err := r.client.CACertificates.UpsertCaCertificate(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {
@@ -314,13 +314,13 @@ func (r *GatewayCACertificateResource) Delete(ctx context.Context, req resource.
 		return
 	}
 
-	request, requestDiags := data.ToOperationsDeleteCaCertificateInWorkspaceRequest(ctx)
+	request, requestDiags := data.ToOperationsDeleteCaCertificateRequest(ctx)
 	resp.Diagnostics.Append(requestDiags...)
 
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	res, err := r.client.CACertificates.DeleteCaCertificateInWorkspace(ctx, *request)
+	res, err := r.client.CACertificates.DeleteCaCertificate(ctx, *request)
 	if err != nil {
 		resp.Diagnostics.AddError("failure to invoke API", err.Error())
 		if res != nil && res.RawResponse != nil {

internal/provider/gatewaycacertificate_resource.go

@@ -32,7 +32,7 @@ func (r *GatewayCACertificateResourceModel) RefreshFromSharedCACertificate(ctx c
 	return diags
 }
 
-func (r *GatewayCACertificateResourceModel) ToOperationsCreateCaCertificateInWorkspaceRequest(ctx context.Context) (*operations.CreateCaCertificateInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayCACertificateResourceModel) ToOperationsCreateCaCertificateRequest(ctx context.Context) (*operations.CreateCaCertificateRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -48,7 +48,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsCreateCaCertificateInWor
 		return nil, diags
 	}
 
-	out := operations.CreateCaCertificateInWorkspaceRequest{
+	out := operations.CreateCaCertificateRequest{
 		ControlPlaneID: controlPlaneID,
 		Workspace:      workspace,
 		CACertificate:  *caCertificate,
@@ -57,7 +57,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsCreateCaCertificateInWor
 	return &out, diags
 }
 
-func (r *GatewayCACertificateResourceModel) ToOperationsDeleteCaCertificateInWorkspaceRequest(ctx context.Context) (*operations.DeleteCaCertificateInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayCACertificateResourceModel) ToOperationsDeleteCaCertificateRequest(ctx context.Context) (*operations.DeleteCaCertificateRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var controlPlaneID string
@@ -69,7 +69,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsDeleteCaCertificateInWor
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.DeleteCaCertificateInWorkspaceRequest{
+	out := operations.DeleteCaCertificateRequest{
 		ControlPlaneID:  controlPlaneID,
 		CACertificateID: caCertificateID,
 		Workspace:       workspace,
@@ -78,7 +78,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsDeleteCaCertificateInWor
 	return &out, diags
 }
 
-func (r *GatewayCACertificateResourceModel) ToOperationsGetCaCertificateInWorkspaceRequest(ctx context.Context) (*operations.GetCaCertificateInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayCACertificateResourceModel) ToOperationsGetCaCertificateRequest(ctx context.Context) (*operations.GetCaCertificateRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var caCertificateID string
@@ -90,7 +90,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsGetCaCertificateInWorksp
 	var workspace string
 	workspace = r.Workspace.ValueString()
 
-	out := operations.GetCaCertificateInWorkspaceRequest{
+	out := operations.GetCaCertificateRequest{
 		CACertificateID: caCertificateID,
 		ControlPlaneID:  controlPlaneID,
 		Workspace:       workspace,
@@ -99,7 +99,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsGetCaCertificateInWorksp
 	return &out, diags
 }
 
-func (r *GatewayCACertificateResourceModel) ToOperationsUpsertCaCertificateInWorkspaceRequest(ctx context.Context) (*operations.UpsertCaCertificateInWorkspaceRequest, diag.Diagnostics) {
+func (r *GatewayCACertificateResourceModel) ToOperationsUpsertCaCertificateRequest(ctx context.Context) (*operations.UpsertCaCertificateRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	var caCertificateID string
@@ -118,7 +118,7 @@ func (r *GatewayCACertificateResourceModel) ToOperationsUpsertCaCertificateInWor
 		return nil, diags
 	}
 
-	out := operations.UpsertCaCertificateInWorkspaceRequest{
+	out := operations.UpsertCaCertificateRequest{
 		CACertificateID: caCertificateID,
 		ControlPlaneID:  controlPlaneID,
 		Workspace:       workspace,