chore(internal): codegen related update (#4954)

cloudflare · Jan 28, 2025 · e6caa22 · e6caa22
1 parent f68e6bb
commit e6caa22
Show file tree

Hide file tree

Showing 51 changed files with 146 additions and 143 deletions.
diff --git a/internal/services/access_rule/data_source_model.go b/internal/services/access_rule/data_source_model.go
@@ -52,29 +52,29 @@ func (m *AccessRuleDataSourceModel) toListParams(_ context.Context) (params fire
 	params = firewall.AccessRuleListParams{}
 
 	if m.Filter.Configuration != nil {
-		paramsConfiguration := AccessRuleListParamsConfiguration{}
+		paramsConfiguration := firewall.AccessRuleListParamsConfiguration{}
 		if !m.Filter.Configuration.Target.IsNull() {
-			paramsConfiguration.Target = cloudflare.F(AccessRuleListParamsConfigurationTarget(m.Filter.Configuration.Target.ValueString()))
+			paramsConfiguration.Target = cloudflare.F(firewall.AccessRuleListParamsConfigurationTarget(m.Filter.Configuration.Target.ValueString()))
 		}
 		if !m.Filter.Configuration.Value.IsNull() {
 			paramsConfiguration.Value = cloudflare.F(m.Filter.Configuration.Value.ValueString())
 		}
 		params.Configuration = cloudflare.F(paramsConfiguration)
 	}
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(AccessRuleListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(firewall.AccessRuleListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 	if !m.Filter.Match.IsNull() {
-		params.Match = cloudflare.F(AccessRuleListParamsMatch(m.Filter.Match.ValueString()))
+		params.Match = cloudflare.F(firewall.AccessRuleListParamsMatch(m.Filter.Match.ValueString()))
 	}
 	if !m.Filter.Mode.IsNull() {
-		params.Mode = cloudflare.F(AccessRuleListParamsMode(m.Filter.Mode.ValueString()))
+		params.Mode = cloudflare.F(firewall.AccessRuleListParamsMode(m.Filter.Mode.ValueString()))
 	}
 	if !m.Filter.Notes.IsNull() {
 		params.Notes = cloudflare.F(m.Filter.Notes.ValueString())
 	}
 	if !m.Filter.Order.IsNull() {
-		params.Order = cloudflare.F(AccessRuleListParamsOrder(m.Filter.Order.ValueString()))
+		params.Order = cloudflare.F(firewall.AccessRuleListParamsOrder(m.Filter.Order.ValueString()))
 	}
 
 	if !m.AccountID.IsNull() {

diff --git a/internal/services/access_rule/list_data_source_model.go b/internal/services/access_rule/list_data_source_model.go
@@ -34,29 +34,29 @@ func (m *AccessRulesDataSourceModel) toListParams(_ context.Context) (params fir
 	params = firewall.AccessRuleListParams{}
 
 	if m.Configuration != nil {
-		paramsConfiguration := AccessRuleListParamsConfiguration{}
+		paramsConfiguration := firewall.AccessRuleListParamsConfiguration{}
 		if !m.Configuration.Target.IsNull() {
-			paramsConfiguration.Target = cloudflare.F(AccessRuleListParamsConfigurationTarget(m.Configuration.Target.ValueString()))
+			paramsConfiguration.Target = cloudflare.F(firewall.AccessRuleListParamsConfigurationTarget(m.Configuration.Target.ValueString()))
 		}
 		if !m.Configuration.Value.IsNull() {
 			paramsConfiguration.Value = cloudflare.F(m.Configuration.Value.ValueString())
 		}
 		params.Configuration = cloudflare.F(paramsConfiguration)
 	}
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(AccessRuleListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(firewall.AccessRuleListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Match.IsNull() {
-		params.Match = cloudflare.F(AccessRuleListParamsMatch(m.Match.ValueString()))
+		params.Match = cloudflare.F(firewall.AccessRuleListParamsMatch(m.Match.ValueString()))
 	}
 	if !m.Mode.IsNull() {
-		params.Mode = cloudflare.F(AccessRuleListParamsMode(m.Mode.ValueString()))
+		params.Mode = cloudflare.F(firewall.AccessRuleListParamsMode(m.Mode.ValueString()))
 	}
 	if !m.Notes.IsNull() {
 		params.Notes = cloudflare.F(m.Notes.ValueString())
 	}
 	if !m.Order.IsNull() {
-		params.Order = cloudflare.F(AccessRuleListParamsOrder(m.Order.ValueString()))
+		params.Order = cloudflare.F(firewall.AccessRuleListParamsOrder(m.Order.ValueString()))
 	}
 
 	if !m.AccountID.IsNull() {

diff --git a/internal/services/account/data_source_model.go b/internal/services/account/data_source_model.go
@@ -42,7 +42,7 @@ func (m *AccountDataSourceModel) toListParams(_ context.Context) (params account
 	params = accounts.AccountListParams{}
 
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(AccountListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.AccountListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 	if !m.Filter.Name.IsNull() {
 		params.Name = cloudflare.F(m.Filter.Name.ValueString())

diff --git a/internal/services/account/list_data_source_model.go b/internal/services/account/list_data_source_model.go
@@ -28,7 +28,7 @@ func (m *AccountsDataSourceModel) toListParams(_ context.Context) (params accoun
 	params = accounts.AccountListParams{}
 
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(AccountListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.AccountListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Name.IsNull() {
 		params.Name = cloudflare.F(m.Name.ValueString())

diff --git a/internal/services/account_member/data_source_model.go b/internal/services/account_member/data_source_model.go
@@ -45,13 +45,13 @@ func (m *AccountMemberDataSourceModel) toListParams(_ context.Context) (params a
 	}
 
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(MemberListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.MemberListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 	if !m.Filter.Order.IsNull() {
-		params.Order = cloudflare.F(MemberListParamsOrder(m.Filter.Order.ValueString()))
+		params.Order = cloudflare.F(accounts.MemberListParamsOrder(m.Filter.Order.ValueString()))
 	}
 	if !m.Filter.Status.IsNull() {
-		params.Status = cloudflare.F(MemberListParamsStatus(m.Filter.Status.ValueString()))
+		params.Status = cloudflare.F(accounts.MemberListParamsStatus(m.Filter.Status.ValueString()))
 	}
 
 	return

diff --git a/internal/services/account_member/list_data_source_model.go b/internal/services/account_member/list_data_source_model.go
@@ -31,13 +31,13 @@ func (m *AccountMembersDataSourceModel) toListParams(_ context.Context) (params
 	}
 
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(MemberListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.MemberListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Order.IsNull() {
-		params.Order = cloudflare.F(MemberListParamsOrder(m.Order.ValueString()))
+		params.Order = cloudflare.F(accounts.MemberListParamsOrder(m.Order.ValueString()))
 	}
 	if !m.Status.IsNull() {
-		params.Status = cloudflare.F(MemberListParamsStatus(m.Status.ValueString()))
+		params.Status = cloudflare.F(accounts.MemberListParamsStatus(m.Status.ValueString()))
 	}
 
 	return

diff --git a/internal/services/account_token/data_source_model.go b/internal/services/account_token/data_source_model.go
@@ -51,7 +51,7 @@ func (m *AccountTokenDataSourceModel) toListParams(_ context.Context) (params ac
 	}
 
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(TokenListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.TokenListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 
 	return

diff --git a/internal/services/account_token/list_data_source_model.go b/internal/services/account_token/list_data_source_model.go
@@ -30,7 +30,7 @@ func (m *AccountTokensDataSourceModel) toListParams(_ context.Context) (params a
 	}
 
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(TokenListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(accounts.TokenListParamsDirection(m.Direction.ValueString()))
 	}
 
 	return

diff --git a/internal/services/api_shield_discovery_operation/list_data_source_model.go b/internal/services/api_shield_discovery_operation/list_data_source_model.go
@@ -32,11 +32,11 @@ type APIShieldDiscoveryOperationsDataSourceModel struct {
 }
 
 func (m *APIShieldDiscoveryOperationsDataSourceModel) toListParams(_ context.Context) (params api_gateway.DiscoveryOperationListParams, diags diag.Diagnostics) {
-	mHost := []DiscoveryOperationListParamsHost{}
+	mHost := []string{}
 	for _, item := range *m.Host {
 		mHost = append(mHost, item.ValueString())
 	}
-	mMethod := []DiscoveryOperationListParamsMethod{}
+	mMethod := []string{}
 	for _, item := range *m.Method {
 		mMethod = append(mMethod, item.ValueString())
 	}
@@ -51,19 +51,19 @@ func (m *APIShieldDiscoveryOperationsDataSourceModel) toListParams(_ context.Con
 		params.Diff = cloudflare.F(m.Diff.ValueBool())
 	}
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(DiscoveryOperationListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(api_gateway.DiscoveryOperationListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Endpoint.IsNull() {
 		params.Endpoint = cloudflare.F(m.Endpoint.ValueString())
 	}
 	if !m.Order.IsNull() {
-		params.Order = cloudflare.F(DiscoveryOperationListParamsOrder(m.Order.ValueString()))
+		params.Order = cloudflare.F(api_gateway.DiscoveryOperationListParamsOrder(m.Order.ValueString()))
 	}
 	if !m.Origin.IsNull() {
-		params.Origin = cloudflare.F(DiscoveryOperationListParamsOrigin(m.Origin.ValueString()))
+		params.Origin = cloudflare.F(api_gateway.DiscoveryOperationListParamsOrigin(m.Origin.ValueString()))
 	}
 	if !m.State.IsNull() {
-		params.State = cloudflare.F(DiscoveryOperationListParamsState(m.State.ValueString()))
+		params.State = cloudflare.F(api_gateway.DiscoveryOperationListParamsState(m.State.ValueString()))
 	}
 
 	return

diff --git a/internal/services/api_shield_operation/data_source_model.go b/internal/services/api_shield_operation/data_source_model.go
@@ -44,15 +44,15 @@ func (m *APIShieldOperationDataSourceModel) toReadParams(_ context.Context) (par
 }
 
 func (m *APIShieldOperationDataSourceModel) toListParams(_ context.Context) (params api_gateway.OperationListParams, diags diag.Diagnostics) {
-	mFilterFeature := []OperationListParamsFeature{}
+	mFilterFeature := []api_gateway.OperationListParamsFeature{}
 	for _, item := range *m.Filter.Feature {
-		mFilterFeature = append(mFilterFeature, OperationListParamsFeature(item.ValueString()))
+		mFilterFeature = append(mFilterFeature, api_gateway.OperationListParamsFeature(item.ValueString()))
 	}
-	mFilterHost := []OperationListParamsHost{}
+	mFilterHost := []string{}
 	for _, item := range *m.Filter.Host {
 		mFilterHost = append(mFilterHost, item.ValueString())
 	}
-	mFilterMethod := []OperationListParamsMethod{}
+	mFilterMethod := []string{}
 	for _, item := range *m.Filter.Method {
 		mFilterMethod = append(mFilterMethod, item.ValueString())
 	}
@@ -65,13 +65,13 @@ func (m *APIShieldOperationDataSourceModel) toListParams(_ context.Context) (par
 	}
 
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(OperationListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(api_gateway.OperationListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 	if !m.Filter.Endpoint.IsNull() {
 		params.Endpoint = cloudflare.F(m.Filter.Endpoint.ValueString())
 	}
 	if !m.Filter.Order.IsNull() {
-		params.Order = cloudflare.F(OperationListParamsOrder(m.Filter.Order.ValueString()))
+		params.Order = cloudflare.F(api_gateway.OperationListParamsOrder(m.Filter.Order.ValueString()))
 	}
 
 	return

diff --git a/internal/services/api_shield_operation/list_data_source_model.go b/internal/services/api_shield_operation/list_data_source_model.go
@@ -31,15 +31,15 @@ type APIShieldOperationsDataSourceModel struct {
 }
 
 func (m *APIShieldOperationsDataSourceModel) toListParams(_ context.Context) (params api_gateway.OperationListParams, diags diag.Diagnostics) {
-	mFeature := []OperationListParamsFeature{}
+	mFeature := []api_gateway.OperationListParamsFeature{}
 	for _, item := range *m.Feature {
-		mFeature = append(mFeature, OperationListParamsFeature(item.ValueString()))
+		mFeature = append(mFeature, api_gateway.OperationListParamsFeature(item.ValueString()))
 	}
-	mHost := []OperationListParamsHost{}
+	mHost := []string{}
 	for _, item := range *m.Host {
 		mHost = append(mHost, item.ValueString())
 	}
-	mMethod := []OperationListParamsMethod{}
+	mMethod := []string{}
 	for _, item := range *m.Method {
 		mMethod = append(mMethod, item.ValueString())
 	}
@@ -52,13 +52,13 @@ func (m *APIShieldOperationsDataSourceModel) toListParams(_ context.Context) (pa
 	}
 
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(OperationListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(api_gateway.OperationListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Endpoint.IsNull() {
 		params.Endpoint = cloudflare.F(m.Endpoint.ValueString())
 	}
 	if !m.Order.IsNull() {
-		params.Order = cloudflare.F(OperationListParamsOrder(m.Order.ValueString()))
+		params.Order = cloudflare.F(api_gateway.OperationListParamsOrder(m.Order.ValueString()))
 	}
 
 	return

diff --git a/internal/services/api_token/data_source_model.go b/internal/services/api_token/data_source_model.go
@@ -40,7 +40,7 @@ func (m *APITokenDataSourceModel) toListParams(_ context.Context) (params user.T
 	params = user.TokenListParams{}
 
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(TokenListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(user.TokenListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 
 	return

diff --git a/internal/services/api_token/list_data_source_model.go b/internal/services/api_token/list_data_source_model.go
@@ -27,7 +27,7 @@ func (m *APITokensDataSourceModel) toListParams(_ context.Context) (params user.
 	params = user.TokenListParams{}
 
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(TokenListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(user.TokenListParamsDirection(m.Direction.ValueString()))
 	}
 
 	return

diff --git a/internal/services/certificate_pack/list_data_source_model.go b/internal/services/certificate_pack/list_data_source_model.go
@@ -29,7 +29,7 @@ func (m *CertificatePacksDataSourceModel) toListParams(_ context.Context) (param
 	}
 
 	if !m.Status.IsNull() {
-		params.Status = cloudflare.F(CertificatePackListParamsStatus(m.Status.ValueString()))
+		params.Status = cloudflare.F(ssl.CertificatePackListParamsStatus(m.Status.ValueString()))
 	}
 
 	return

diff --git a/internal/services/custom_hostname/data_source_model.go b/internal/services/custom_hostname/data_source_model.go
@@ -55,16 +55,16 @@ func (m *CustomHostnameDataSourceModel) toListParams(_ context.Context) (params
 		params.ID = cloudflare.F(m.Filter.ID.ValueString())
 	}
 	if !m.Filter.Direction.IsNull() {
-		params.Direction = cloudflare.F(CustomHostnameListParamsDirection(m.Filter.Direction.ValueString()))
+		params.Direction = cloudflare.F(custom_hostnames.CustomHostnameListParamsDirection(m.Filter.Direction.ValueString()))
 	}
 	if !m.Filter.Hostname.IsNull() {
 		params.Hostname = cloudflare.F(m.Filter.Hostname.ValueString())
 	}
 	if !m.Filter.Order.IsNull() {
-		params.Order = cloudflare.F(CustomHostnameListParamsOrder(m.Filter.Order.ValueString()))
+		params.Order = cloudflare.F(custom_hostnames.CustomHostnameListParamsOrder(m.Filter.Order.ValueString()))
 	}
 	if !m.Filter.SSL.IsNull() {
-		params.SSL = cloudflare.F(CustomHostnameListParamsSSL(m.Filter.SSL.ValueFloat64()))
+		params.SSL = cloudflare.F(custom_hostnames.CustomHostnameListParamsSSL(m.Filter.SSL.ValueFloat64()))
 	}
 
 	return

diff --git a/internal/services/custom_hostname/list_data_source_model.go b/internal/services/custom_hostname/list_data_source_model.go
@@ -37,16 +37,16 @@ func (m *CustomHostnamesDataSourceModel) toListParams(_ context.Context) (params
 		params.ID = cloudflare.F(m.ID.ValueString())
 	}
 	if !m.Direction.IsNull() {
-		params.Direction = cloudflare.F(CustomHostnameListParamsDirection(m.Direction.ValueString()))
+		params.Direction = cloudflare.F(custom_hostnames.CustomHostnameListParamsDirection(m.Direction.ValueString()))
 	}
 	if !m.Hostname.IsNull() {
 		params.Hostname = cloudflare.F(m.Hostname.ValueString())
 	}
 	if !m.Order.IsNull() {
-		params.Order = cloudflare.F(CustomHostnameListParamsOrder(m.Order.ValueString()))
+		params.Order = cloudflare.F(custom_hostnames.CustomHostnameListParamsOrder(m.Order.ValueString()))
 	}
 	if !m.SSL.IsNull() {
-		params.SSL = cloudflare.F(CustomHostnameListParamsSSL(m.SSL.ValueFloat64()))
+		params.SSL = cloudflare.F(custom_hostnames.CustomHostnameListParamsSSL(m.SSL.ValueFloat64()))
 	}
 
 	return

diff --git a/internal/services/custom_ssl/data_source_model.go b/internal/services/custom_ssl/data_source_model.go
@@ -54,10 +54,10 @@ func (m *CustomSSLDataSourceModel) toListParams(_ context.Context) (params custo
 	}
 
 	if !m.Filter.Match.IsNull() {
-		params.Match = cloudflare.F(CustomCertificateListParamsMatch(m.Filter.Match.ValueString()))
+		params.Match = cloudflare.F(custom_certificates.CustomCertificateListParamsMatch(m.Filter.Match.ValueString()))
 	}
 	if !m.Filter.Status.IsNull() {
-		params.Status = cloudflare.F(CustomCertificateListParamsStatus(m.Filter.Status.ValueString()))
+		params.Status = cloudflare.F(custom_certificates.CustomCertificateListParamsStatus(m.Filter.Status.ValueString()))
 	}
 
 	return

diff --git a/internal/services/custom_ssl/list_data_source_model.go b/internal/services/custom_ssl/list_data_source_model.go
@@ -31,10 +31,10 @@ func (m *CustomSSLsDataSourceModel) toListParams(_ context.Context) (params cust
 	}
 
 	if !m.Match.IsNull() {
-		params.Match = cloudflare.F(CustomCertificateListParamsMatch(m.Match.ValueString()))
+		params.Match = cloudflare.F(custom_certificates.CustomCertificateListParamsMatch(m.Match.ValueString()))
 	}
 	if !m.Status.IsNull() {
-		params.Status = cloudflare.F(CustomCertificateListParamsStatus(m.Status.ValueString()))
+		params.Status = cloudflare.F(custom_certificates.CustomCertificateListParamsStatus(m.Status.ValueString()))
 	}
 
 	return
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	if !m.Filter.Direction.IsNull() {
-    		params.Direction = cloudflare.F(TokenListParamsDirection(m.Filter.Direction.ValueString()))
+    		params.Direction = cloudflare.F(accounts.TokenListParamsDirection(m.Filter.Direction.ValueString()))
     	}
     	return
@@ Expand Down @@