feat(tunnels)!: move all cloudflared resources into dedicated namespa…

…ce (#5143)
cloudflare · Feb 14, 2025 · 3b2bdc7 · 3b2bdc7
1 parent 992cc19
commit 3b2bdc7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 36 deletions.
diff --git a/.stats.yml b/.stats.yml
@@ -1,2 +1,2 @@
-configured_endpoints: 1525
+configured_endpoints: 1526
 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-e6f75d6387709ef6a98e7327b59c7ca9205e26a1252ea5e370e75be27ec21022.yml
diff --git a/internal/services/zero_trust_tunnel_cloudflared/data_source.go b/internal/services/zero_trust_tunnel_cloudflared/data_source.go
@@ -65,7 +65,7 @@ func (d *ZeroTrustTunnelCloudflaredDataSource) Read(ctx context.Context, req dat
 		}
 
 		env := ZeroTrustTunnelCloudflaredsResultListDataSourceEnvelope{}
-		page, err := d.client.ZeroTrust.Tunnels.List(ctx, params)
+		page, err := d.client.ZeroTrust.Tunnels.Cloudflared.List(ctx, params)
 		if err != nil {
 			resp.Diagnostics.AddError("failed to make http request", err.Error())
 			return
@@ -95,7 +95,7 @@ func (d *ZeroTrustTunnelCloudflaredDataSource) Read(ctx context.Context, req dat
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredResultDataSourceEnvelope{*data}
-	_, err := d.client.ZeroTrust.Tunnels.Get(
+	_, err := d.client.ZeroTrust.Tunnels.Cloudflared.Get(
 		ctx,
 		data.TunnelID.ValueString(),
 		params,

diff --git a/internal/services/zero_trust_tunnel_cloudflared/data_source_model.go b/internal/services/zero_trust_tunnel_cloudflared/data_source_model.go
@@ -36,21 +36,21 @@ type ZeroTrustTunnelCloudflaredDataSourceModel struct {
 	Filter          *ZeroTrustTunnelCloudflaredFindOneByDataSourceModel                                `tfsdk:"filter"`
 }
 
-func (m *ZeroTrustTunnelCloudflaredDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelGetParams, diags diag.Diagnostics) {
-	params = zero_trust.TunnelGetParams{
+func (m *ZeroTrustTunnelCloudflaredDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelCloudflaredGetParams, diags diag.Diagnostics) {
+	params = zero_trust.TunnelCloudflaredGetParams{
 		AccountID: cloudflare.F(m.AccountID.ValueString()),
 	}
 
 	return
 }
 
-func (m *ZeroTrustTunnelCloudflaredDataSourceModel) toListParams(_ context.Context) (params zero_trust.TunnelListParams, diags diag.Diagnostics) {
+func (m *ZeroTrustTunnelCloudflaredDataSourceModel) toListParams(_ context.Context) (params zero_trust.TunnelCloudflaredListParams, diags diag.Diagnostics) {
 	mFilterWasActiveAt, errs := m.Filter.WasActiveAt.ValueRFC3339Time()
 	diags.Append(errs...)
 	mFilterWasInactiveAt, errs := m.Filter.WasInactiveAt.ValueRFC3339Time()
 	diags.Append(errs...)
 
-	params = zero_trust.TunnelListParams{
+	params = zero_trust.TunnelCloudflaredListParams{
 		AccountID: cloudflare.F(m.AccountID.ValueString()),
 	}
 
@@ -70,7 +70,7 @@ func (m *ZeroTrustTunnelCloudflaredDataSourceModel) toListParams(_ context.Conte
 		params.Name = cloudflare.F(m.Filter.Name.ValueString())
 	}
 	if !m.Filter.Status.IsNull() {
-		params.Status = cloudflare.F(zero_trust.TunnelListParamsStatus(m.Filter.Status.ValueString()))
+		params.Status = cloudflare.F(zero_trust.TunnelCloudflaredListParamsStatus(m.Filter.Status.ValueString()))
 	}
 	if !m.Filter.UUID.IsNull() {
 		params.UUID = cloudflare.F(m.Filter.UUID.ValueString())

diff --git a/internal/services/zero_trust_tunnel_cloudflared/list_data_source.go b/internal/services/zero_trust_tunnel_cloudflared/list_data_source.go
@@ -67,7 +67,7 @@ func (d *ZeroTrustTunnelCloudflaredsDataSource) Read(ctx context.Context, req da
 	if maxItems <= 0 {
 		maxItems = 1000
 	}
-	page, err := d.client.ZeroTrust.Tunnels.List(ctx, params)
+	page, err := d.client.ZeroTrust.Tunnels.Cloudflared.List(ctx, params)
 	if err != nil {
 		resp.Diagnostics.AddError("failed to make http request", err.Error())
 		return

diff --git a/internal/services/zero_trust_tunnel_cloudflared/list_data_source_model.go b/internal/services/zero_trust_tunnel_cloudflared/list_data_source_model.go
@@ -33,13 +33,13 @@ type ZeroTrustTunnelCloudflaredsDataSourceModel struct {
 	Result        customfield.NestedObjectList[ZeroTrustTunnelCloudflaredsResultDataSourceModel] `tfsdk:"result"`
 }
 
-func (m *ZeroTrustTunnelCloudflaredsDataSourceModel) toListParams(_ context.Context) (params zero_trust.TunnelListParams, diags diag.Diagnostics) {
+func (m *ZeroTrustTunnelCloudflaredsDataSourceModel) toListParams(_ context.Context) (params zero_trust.TunnelCloudflaredListParams, diags diag.Diagnostics) {
 	mWasActiveAt, errs := m.WasActiveAt.ValueRFC3339Time()
 	diags.Append(errs...)
 	mWasInactiveAt, errs := m.WasInactiveAt.ValueRFC3339Time()
 	diags.Append(errs...)
 
-	params = zero_trust.TunnelListParams{
+	params = zero_trust.TunnelCloudflaredListParams{
 		AccountID: cloudflare.F(m.AccountID.ValueString()),
 	}
 
@@ -59,7 +59,7 @@ func (m *ZeroTrustTunnelCloudflaredsDataSourceModel) toListParams(_ context.Cont
 		params.Name = cloudflare.F(m.Name.ValueString())
 	}
 	if !m.Status.IsNull() {
-		params.Status = cloudflare.F(zero_trust.TunnelListParamsStatus(m.Status.ValueString()))
+		params.Status = cloudflare.F(zero_trust.TunnelCloudflaredListParamsStatus(m.Status.ValueString()))
 	}
 	if !m.UUID.IsNull() {
 		params.UUID = cloudflare.F(m.UUID.ValueString())

diff --git a/internal/services/zero_trust_tunnel_cloudflared/resource.go b/internal/services/zero_trust_tunnel_cloudflared/resource.go
@@ -71,9 +71,9 @@ func (r *ZeroTrustTunnelCloudflaredResource) Create(ctx context.Context, req res
 	}
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredResultEnvelope{*data}
-	_, err = r.client.ZeroTrust.Tunnels.New(
+	_, err = r.client.ZeroTrust.Tunnels.Cloudflared.New(
 		ctx,
-		zero_trust.TunnelNewParams{
+		zero_trust.TunnelCloudflaredNewParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithRequestBody("application/json", dataBytes),
@@ -119,10 +119,10 @@ func (r *ZeroTrustTunnelCloudflaredResource) Update(ctx context.Context, req res
 	}
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredResultEnvelope{*data}
-	_, err = r.client.ZeroTrust.Tunnels.Edit(
+	_, err = r.client.ZeroTrust.Tunnels.Cloudflared.Edit(
 		ctx,
 		data.ID.ValueString(),
-		zero_trust.TunnelEditParams{
+		zero_trust.TunnelCloudflaredEditParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithRequestBody("application/json", dataBytes),
@@ -155,10 +155,10 @@ func (r *ZeroTrustTunnelCloudflaredResource) Read(ctx context.Context, req resou
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredResultEnvelope{*data}
-	_, err := r.client.ZeroTrust.Tunnels.Get(
+	_, err := r.client.ZeroTrust.Tunnels.Cloudflared.Get(
 		ctx,
 		data.ID.ValueString(),
-		zero_trust.TunnelGetParams{
+		zero_trust.TunnelCloudflaredGetParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithResponseBodyInto(&res),
@@ -193,10 +193,10 @@ func (r *ZeroTrustTunnelCloudflaredResource) Delete(ctx context.Context, req res
 		return
 	}
 
-	_, err := r.client.ZeroTrust.Tunnels.Delete(
+	_, err := r.client.ZeroTrust.Tunnels.Cloudflared.Delete(
 		ctx,
 		data.ID.ValueString(),
-		zero_trust.TunnelDeleteParams{
+		zero_trust.TunnelCloudflaredDeleteParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithMiddleware(logging.Middleware(ctx)),
@@ -230,10 +230,10 @@ func (r *ZeroTrustTunnelCloudflaredResource) ImportState(ctx context.Context, re
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredResultEnvelope{*data}
-	_, err := r.client.ZeroTrust.Tunnels.Get(
+	_, err := r.client.ZeroTrust.Tunnels.Cloudflared.Get(
 		ctx,
 		path_tunnel_id,
-		zero_trust.TunnelGetParams{
+		zero_trust.TunnelCloudflaredGetParams{
 			AccountID: cloudflare.F(path_account_id),
 		},
 		option.WithResponseBodyInto(&res),

diff --git a/internal/services/zero_trust_tunnel_cloudflared_config/data_source.go b/internal/services/zero_trust_tunnel_cloudflared_config/data_source.go
@@ -65,7 +65,7 @@ func (d *ZeroTrustTunnelCloudflaredConfigDataSource) Read(ctx context.Context, r
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredConfigResultDataSourceEnvelope{*data}
-	_, err := d.client.ZeroTrust.Tunnels.Configurations.Get(
+	_, err := d.client.ZeroTrust.Tunnels.Cloudflared.Configurations.Get(
 		ctx,
 		data.TunnelID.ValueString(),
 		params,

diff --git a/internal/services/zero_trust_tunnel_cloudflared_config/data_source_model.go b/internal/services/zero_trust_tunnel_cloudflared_config/data_source_model.go
@@ -26,8 +26,8 @@ type ZeroTrustTunnelCloudflaredConfigDataSourceModel struct {
 	Config    customfield.NestedObject[ZeroTrustTunnelCloudflaredConfigConfigDataSourceModel] `tfsdk:"config" json:"config,computed"`
 }
 
-func (m *ZeroTrustTunnelCloudflaredConfigDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelConfigurationGetParams, diags diag.Diagnostics) {
-	params = zero_trust.TunnelConfigurationGetParams{
+func (m *ZeroTrustTunnelCloudflaredConfigDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelCloudflaredConfigurationGetParams, diags diag.Diagnostics) {
+	params = zero_trust.TunnelCloudflaredConfigurationGetParams{
 		AccountID: cloudflare.F(m.AccountID.ValueString()),
 	}
 

diff --git a/internal/services/zero_trust_tunnel_cloudflared_config/resource.go b/internal/services/zero_trust_tunnel_cloudflared_config/resource.go
@@ -71,10 +71,10 @@ func (r *ZeroTrustTunnelCloudflaredConfigResource) Create(ctx context.Context, r
 	}
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredConfigResultEnvelope{*data}
-	_, err = r.client.ZeroTrust.Tunnels.Configurations.Update(
+	_, err = r.client.ZeroTrust.Tunnels.Cloudflared.Configurations.Update(
 		ctx,
 		data.TunnelID.ValueString(),
-		zero_trust.TunnelConfigurationUpdateParams{
+		zero_trust.TunnelCloudflaredConfigurationUpdateParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithRequestBody("application/json", dataBytes),
@@ -121,10 +121,10 @@ func (r *ZeroTrustTunnelCloudflaredConfigResource) Update(ctx context.Context, r
 	}
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredConfigResultEnvelope{*data}
-	_, err = r.client.ZeroTrust.Tunnels.Configurations.Update(
+	_, err = r.client.ZeroTrust.Tunnels.Cloudflared.Configurations.Update(
 		ctx,
 		data.TunnelID.ValueString(),
-		zero_trust.TunnelConfigurationUpdateParams{
+		zero_trust.TunnelCloudflaredConfigurationUpdateParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithRequestBody("application/json", dataBytes),
@@ -158,10 +158,10 @@ func (r *ZeroTrustTunnelCloudflaredConfigResource) Read(ctx context.Context, req
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredConfigResultEnvelope{*data}
-	_, err := r.client.ZeroTrust.Tunnels.Configurations.Get(
+	_, err := r.client.ZeroTrust.Tunnels.Cloudflared.Configurations.Get(
 		ctx,
 		data.TunnelID.ValueString(),
-		zero_trust.TunnelConfigurationGetParams{
+		zero_trust.TunnelCloudflaredConfigurationGetParams{
 			AccountID: cloudflare.F(data.AccountID.ValueString()),
 		},
 		option.WithResponseBodyInto(&res),
@@ -213,10 +213,10 @@ func (r *ZeroTrustTunnelCloudflaredConfigResource) ImportState(ctx context.Conte
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredConfigResultEnvelope{*data}
-	_, err := r.client.ZeroTrust.Tunnels.Configurations.Get(
+	_, err := r.client.ZeroTrust.Tunnels.Cloudflared.Configurations.Get(
 		ctx,
 		path_tunnel_id,
-		zero_trust.TunnelConfigurationGetParams{
+		zero_trust.TunnelCloudflaredConfigurationGetParams{
 			AccountID: cloudflare.F(path_account_id),
 		},
 		option.WithResponseBodyInto(&res),

diff --git a/internal/services/zero_trust_tunnel_cloudflared_token/data_source.go b/internal/services/zero_trust_tunnel_cloudflared_token/data_source.go
@@ -65,7 +65,7 @@ func (d *ZeroTrustTunnelCloudflaredTokenDataSource) Read(ctx context.Context, re
 
 	res := new(http.Response)
 	env := ZeroTrustTunnelCloudflaredTokenResultDataSourceEnvelope{*data}
-	_, err := d.client.ZeroTrust.Tunnels.Token.Get(
+	_, err := d.client.ZeroTrust.Tunnels.Cloudflared.Token.Get(
 		ctx,
 		data.TunnelID.ValueString(),
 		params,

diff --git a/internal/services/zero_trust_tunnel_cloudflared_token/data_source_model.go b/internal/services/zero_trust_tunnel_cloudflared_token/data_source_model.go
@@ -20,8 +20,8 @@ type ZeroTrustTunnelCloudflaredTokenDataSourceModel struct {
 	TunnelID  types.String `tfsdk:"tunnel_id" path:"tunnel_id,required"`
 }
 
-func (m *ZeroTrustTunnelCloudflaredTokenDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelTokenGetParams, diags diag.Diagnostics) {
-	params = zero_trust.TunnelTokenGetParams{
+func (m *ZeroTrustTunnelCloudflaredTokenDataSourceModel) toReadParams(_ context.Context) (params zero_trust.TunnelCloudflaredTokenGetParams, diags diag.Diagnostics) {
+	params = zero_trust.TunnelCloudflaredTokenGetParams{
 		AccountID: cloudflare.F(m.AccountID.ValueString()),
 	}