From 537d9fb24c49b205dc4c84a2d37c778a040e4fdb Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Fri, 7 Jul 2023 11:02:35 +1000 Subject: [PATCH] update to new upstream method signatures --- internal/app/cf-terraforming/cmd/generate.go | 161 ++++++------------ internal/app/cf-terraforming/cmd/import.go | 30 ++-- ...are_access_application_simple_account.yaml | 2 +- ..._access_application_with_cors_account.yaml | 2 +- .../cloudflare_access_group_account.yaml | 2 +- .../cloudflare_access_group_zone.yaml | 2 +- ...ccess_identity_provider_oauth_account.yaml | 2 +- ...e_access_identity_provider_oauth_zone.yaml | 2 +- ..._access_identity_provider_otp_account.yaml | 2 +- ...are_access_identity_provider_otp_zone.yaml | 2 +- 10 files changed, 83 insertions(+), 124 deletions(-) diff --git a/internal/app/cf-terraforming/cmd/generate.go b/internal/app/cf-terraforming/cmd/generate.go index 3e5dfa103..acca0d5f7 100644 --- a/internal/app/cf-terraforming/cmd/generate.go +++ b/internal/app/cf-terraforming/cmd/generate.go @@ -101,113 +101,64 @@ func generateResources() func(cmd *cobra.Command, args []string) { // restrictions and the need to explicitly map out the structs. var jsonStructData []interface{} + var identifier *cloudflare.ResourceContainer + if accountID != "" { + identifier = cloudflare.AccountIdentifier(accountID) + } else { + identifier = cloudflare.ZoneIdentifier(zoneID) + } + switch resourceType { case "cloudflare_access_application": - if accountID != "" { - jsonPayload, _, err := api.AccessApplications(context.Background(), accountID, cloudflare.PaginationOptions{}) - if err != nil { - log.Fatal(err) - } - - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } - } else { - jsonPayload, _, err := api.ZoneLevelAccessApplications(context.Background(), zoneID, cloudflare.PaginationOptions{}) - if err != nil { - log.Fatal(err) - } + jsonPayload, _, err := api.ListAccessApplications(context.Background(), identifier, cloudflare.ListAccessApplicationsParams{}) + if err != nil { + log.Fatal(err) + } - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } + resourceCount = len(jsonPayload) + m, _ := json.Marshal(jsonPayload) + err = json.Unmarshal(m, &jsonStructData) + if err != nil { + log.Fatal(err) } case "cloudflare_access_group": - if accountID != "" { - jsonPayload, _, err := api.AccessGroups(context.Background(), accountID, cloudflare.PaginationOptions{}) - if err != nil { - log.Fatal(err) - } - - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } - } else { - jsonPayload, _, err := api.ZoneLevelAccessGroups(context.Background(), zoneID, cloudflare.PaginationOptions{}) - if err != nil { - log.Fatal(err) - } + jsonPayload, _, err := api.ListAccessGroups(context.Background(), identifier, cloudflare.ListAccessGroupsParams{}) + if err != nil { + log.Fatal(err) + } - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } + resourceCount = len(jsonPayload) + m, _ := json.Marshal(jsonPayload) + err = json.Unmarshal(m, &jsonStructData) + if err != nil { + log.Fatal(err) } case "cloudflare_access_identity_provider": - if accountID != "" { - jsonPayload, err := api.AccessIdentityProviders(context.Background(), accountID) - if err != nil { - log.Fatal(err) - } - - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } - } else { - jsonPayload, err := api.ZoneLevelAccessIdentityProviders(context.Background(), zoneID) - if err != nil { - log.Fatal(err) - } + jsonPayload, _, err := api.ListAccessIdentityProviders(context.Background(), identifier, cloudflare.ListAccessIdentityProvidersParams{}) + if err != nil { + log.Fatal(err) + } - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } + resourceCount = len(jsonPayload) + m, _ := json.Marshal(jsonPayload) + err = json.Unmarshal(m, &jsonStructData) + if err != nil { + log.Fatal(err) } case "cloudflare_access_service_token": - if accountID != "" { - jsonPayload, _, err := api.AccessServiceTokens(context.Background(), accountID) - if err != nil { - log.Fatal(err) - } - - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } - } else { - jsonPayload, _, err := api.ZoneLevelAccessServiceTokens(context.Background(), zoneID) - if err != nil { - log.Fatal(err) - } + jsonPayload, _, err := api.ListAccessServiceTokens(context.Background(), identifier, cloudflare.ListAccessServiceTokensParams{}) + if err != nil { + log.Fatal(err) + } - resourceCount = len(jsonPayload) - m, _ := json.Marshal(jsonPayload) - err = json.Unmarshal(m, &jsonStructData) - if err != nil { - log.Fatal(err) - } + resourceCount = len(jsonPayload) + m, _ := json.Marshal(jsonPayload) + err = json.Unmarshal(m, &jsonStructData) + if err != nil { + log.Fatal(err) } case "cloudflare_access_mutual_tls_certificate": - jsonPayload, err := api.AccessMutualTLSCertificates(context.Background(), accountID) + jsonPayload, _, err := api.ListAccessMutualTLSCertificates(context.Background(), identifier, cloudflare.ListAccessMutualTLSCertificatesParams{}) if err != nil { log.Fatal(err) } @@ -295,7 +246,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { } case "cloudflare_api_shield": jsonPayload := []cloudflare.APIShield{} - apiShieldConfig, _, err := api.GetAPIShieldConfiguration(context.Background(), cloudflare.ZoneIdentifier(zoneID)) + apiShieldConfig, _, err := api.GetAPIShieldConfiguration(context.Background(), identifier) if err != nil { log.Fatal(err) } @@ -447,7 +398,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { jsonStructData[i].(map[string]interface{})["status"] = nil } case "cloudflare_filter": - jsonPayload, _, err := api.Filters(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.FilterListParams{}) + jsonPayload, _, err := api.Filters(context.Background(), identifier, cloudflare.FilterListParams{}) if err != nil { log.Fatal(err) } @@ -459,7 +410,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_firewall_rule": - jsonPayload, _, err := api.FirewallRules(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.FirewallRuleListParams{}) + jsonPayload, _, err := api.FirewallRules(context.Background(), identifier, cloudflare.FirewallRuleListParams{}) if err != nil { log.Fatal(err) } @@ -516,7 +467,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_load_balancer": - jsonPayload, err := api.ListLoadBalancers(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListLoadBalancerParams{}) + jsonPayload, err := api.ListLoadBalancers(context.Background(), identifier, cloudflare.ListLoadBalancerParams{}) if err != nil { log.Fatal(err) } @@ -561,7 +512,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { } case "cloudflare_load_balancer_pool": - jsonPayload, err := api.ListLoadBalancerPools(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListLoadBalancerPoolParams{}) + jsonPayload, err := api.ListLoadBalancerPools(context.Background(), identifier, cloudflare.ListLoadBalancerPoolParams{}) if err != nil { log.Fatal(err) } @@ -582,7 +533,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { } } case "cloudflare_load_balancer_monitor": - jsonPayload, err := api.ListLoadBalancerMonitors(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListLoadBalancerMonitorParams{}) + jsonPayload, err := api.ListLoadBalancerMonitors(context.Background(), identifier, cloudflare.ListLoadBalancerMonitorParams{}) if err != nil { log.Fatal(err) } @@ -594,7 +545,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_logpush_job": - jsonPayload, err := api.LogpushJobs(context.Background(), zoneID) + jsonPayload, err := api.ListLogpushJobs(context.Background(), identifier, cloudflare.ListLogpushJobsParams{}) if err != nil { log.Fatal(err) } @@ -732,7 +683,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { case "cloudflare_record": simpleDNSTypes := []string{"A", "AAAA", "CNAME", "TXT", "MX", "NS", "PTR"} - jsonPayload, _, err := api.ListDNSRecords(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListDNSRecordsParams{}) + jsonPayload, _, err := api.ListDNSRecords(context.Background(), identifier, cloudflare.ListDNSRecordsParams{}) if err != nil { log.Fatal(err) } @@ -969,7 +920,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { jsonStructData[i].(map[string]interface{})["connections"] = nil } case "cloudflare_turnstile_widget": - jsonPayload, _, err := api.ListTurnstileWidgets(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListTurnstileWidgetParams{}) + jsonPayload, _, err := api.ListTurnstileWidgets(context.Background(), identifier, cloudflare.ListTurnstileWidgetParams{}) if err != nil { log.Fatal(err) } @@ -1012,7 +963,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_workers_kv_namespace": - jsonPayload, _, err := api.ListWorkersKVNamespaces(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListWorkersKVNamespacesParams{}) + jsonPayload, _, err := api.ListWorkersKVNamespaces(context.Background(), identifier, cloudflare.ListWorkersKVNamespacesParams{}) if err != nil { log.Fatal(err) } @@ -1023,7 +974,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_worker_route": - jsonPayload, err := api.ListWorkerRoutes(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListWorkerRoutesParams{}) + jsonPayload, err := api.ListWorkerRoutes(context.Background(), identifier, cloudflare.ListWorkerRoutesParams{}) if err != nil { log.Fatal(err) } @@ -1064,7 +1015,7 @@ func generateResources() func(cmd *cobra.Command, args []string) { jsonStructData[i].(map[string]interface{})["account_id"] = jsonStructData[i].(map[string]interface{})["account"].(map[string]interface{})["id"].(string) } case "cloudflare_zone_lockdown": - jsonPayload, _, err := api.ListZoneLockdowns(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.LockdownListParams{}) + jsonPayload, _, err := api.ListZoneLockdowns(context.Background(), identifier, cloudflare.LockdownListParams{}) if err != nil { log.Fatal(err) } diff --git a/internal/app/cf-terraforming/cmd/import.go b/internal/app/cf-terraforming/cmd/import.go index 488cc84a7..be7c2f9f3 100644 --- a/internal/app/cf-terraforming/cmd/import.go +++ b/internal/app/cf-terraforming/cmd/import.go @@ -60,6 +60,14 @@ var importCommand = &cobra.Command{ func runImport() func(cmd *cobra.Command, args []string) { return func(cmd *cobra.Command, args []string) { var jsonStructData []interface{} + + var identifier *cloudflare.ResourceContainer + if accountID != "" { + identifier = cloudflare.AccountIdentifier(accountID) + } else { + identifier = cloudflare.ZoneIdentifier(zoneID) + } + switch resourceType { case "cloudflare_access_rule": if accountID != "" { @@ -159,7 +167,7 @@ func runImport() func(cmd *cobra.Command, args []string) { } } case "cloudflare_filter": - jsonPayload, _, err := api.Filters(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.FilterListParams{}) + jsonPayload, _, err := api.Filters(context.Background(), identifier, cloudflare.FilterListParams{}) if err != nil { log.Fatal(err) } @@ -169,7 +177,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_firewall_rule": - jsonPayload, _, err := api.FirewallRules(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.FirewallRuleListParams{}) + jsonPayload, _, err := api.FirewallRules(context.Background(), identifier, cloudflare.FirewallRuleListParams{}) if err != nil { log.Fatal(err) } @@ -220,7 +228,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_load_balancer": - jsonPayload, err := api.ListLoadBalancers(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListLoadBalancerParams{}) + jsonPayload, err := api.ListLoadBalancers(context.Background(), identifier, cloudflare.ListLoadBalancerParams{}) if err != nil { log.Fatal(err) } @@ -230,7 +238,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_load_balancer_pool": - jsonPayload, err := api.ListLoadBalancerPools(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListLoadBalancerPoolParams{}) + jsonPayload, err := api.ListLoadBalancerPools(context.Background(), identifier, cloudflare.ListLoadBalancerPoolParams{}) if err != nil { log.Fatal(err) } @@ -240,7 +248,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_load_balancer_monitor": - jsonPayload, err := api.ListLoadBalancerMonitors(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListLoadBalancerMonitorParams{}) + jsonPayload, err := api.ListLoadBalancerMonitors(context.Background(), identifier, cloudflare.ListLoadBalancerMonitorParams{}) if err != nil { log.Fatal(err) } @@ -250,7 +258,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_logpush_job": - jsonPayload, err := api.LogpushJobs(context.Background(), zoneID) + jsonPayload, err := api.ListLogpushJobs(context.Background(), identifier, cloudflare.ListLogpushJobsParams{}) if err != nil { log.Fatal(err) } @@ -293,7 +301,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_record": - jsonPayload, _, err := api.ListDNSRecords(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListDNSRecordsParams{}) + jsonPayload, _, err := api.ListDNSRecords(context.Background(), identifier, cloudflare.ListDNSRecordsParams{}) if err != nil { log.Fatal(err) } @@ -362,7 +370,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_turnstile_widget": - jsonPayload, _, err := api.ListTurnstileWidgets(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListTurnstileWidgetParams{}) + jsonPayload, _, err := api.ListTurnstileWidgets(context.Background(), identifier, cloudflare.ListTurnstileWidgetParams{}) if err != nil { log.Fatal(err) } @@ -407,7 +415,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_workers_kv_namespace": - jsonPayload, _, err := api.ListWorkersKVNamespaces(context.Background(), cloudflare.AccountIdentifier(accountID), cloudflare.ListWorkersKVNamespacesParams{}) + jsonPayload, _, err := api.ListWorkersKVNamespaces(context.Background(), identifier, cloudflare.ListWorkersKVNamespacesParams{}) if err != nil { log.Fatal(err) } @@ -418,7 +426,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_worker_route": - jsonPayload, err := api.ListWorkerRoutes(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.ListWorkerRoutesParams{}) + jsonPayload, err := api.ListWorkerRoutes(context.Background(), identifier, cloudflare.ListWorkerRoutesParams{}) if err != nil { log.Fatal(err) } @@ -439,7 +447,7 @@ func runImport() func(cmd *cobra.Command, args []string) { log.Fatal(err) } case "cloudflare_zone_lockdown": - jsonPayload, _, err := api.ListZoneLockdowns(context.Background(), cloudflare.ZoneIdentifier(zoneID), cloudflare.LockdownListParams{}) + jsonPayload, _, err := api.ListZoneLockdowns(context.Background(), identifier, cloudflare.LockdownListParams{}) if err != nil { log.Fatal(err) } diff --git a/testdata/cloudflare/cloudflare_access_application_simple_account.yaml b/testdata/cloudflare/cloudflare_access_application_simple_account.yaml index 9b0bfd4c6..8e9c5b225 100644 --- a/testdata/cloudflare/cloudflare_access_application_simple_account.yaml +++ b/testdata/cloudflare/cloudflare_access_application_simple_account.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/apps + url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/apps?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_application_with_cors_account.yaml b/testdata/cloudflare/cloudflare_access_application_with_cors_account.yaml index 53a6daf28..a26a2d4e7 100644 --- a/testdata/cloudflare/cloudflare_access_application_with_cors_account.yaml +++ b/testdata/cloudflare/cloudflare_access_application_with_cors_account.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/apps + url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/apps?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_group_account.yaml b/testdata/cloudflare/cloudflare_access_group_account.yaml index 2f3062af3..2eb923d9d 100644 --- a/testdata/cloudflare/cloudflare_access_group_account.yaml +++ b/testdata/cloudflare/cloudflare_access_group_account.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/groups + url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/groups?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_group_zone.yaml b/testdata/cloudflare/cloudflare_access_group_zone.yaml index 208a92172..3adae2085 100644 --- a/testdata/cloudflare/cloudflare_access_group_zone.yaml +++ b/testdata/cloudflare/cloudflare_access_group_zone.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/groups + url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/groups?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_identity_provider_oauth_account.yaml b/testdata/cloudflare/cloudflare_access_identity_provider_oauth_account.yaml index 8ef2a077b..ebbebf6db 100644 --- a/testdata/cloudflare/cloudflare_access_identity_provider_oauth_account.yaml +++ b/testdata/cloudflare/cloudflare_access_identity_provider_oauth_account.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/identity_providers + url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/identity_providers?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_identity_provider_oauth_zone.yaml b/testdata/cloudflare/cloudflare_access_identity_provider_oauth_zone.yaml index 37c2c168b..bc47c6490 100644 --- a/testdata/cloudflare/cloudflare_access_identity_provider_oauth_zone.yaml +++ b/testdata/cloudflare/cloudflare_access_identity_provider_oauth_zone.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/identity_providers + url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/identity_providers?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_identity_provider_otp_account.yaml b/testdata/cloudflare/cloudflare_access_identity_provider_otp_account.yaml index dfac2dbc6..8af216937 100644 --- a/testdata/cloudflare/cloudflare_access_identity_provider_otp_account.yaml +++ b/testdata/cloudflare/cloudflare_access_identity_provider_otp_account.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/identity_providers + url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/access/identity_providers?page=1&per_page=25 method: GET response: body: | diff --git a/testdata/cloudflare/cloudflare_access_identity_provider_otp_zone.yaml b/testdata/cloudflare/cloudflare_access_identity_provider_otp_zone.yaml index 451869312..40752114e 100644 --- a/testdata/cloudflare/cloudflare_access_identity_provider_otp_zone.yaml +++ b/testdata/cloudflare/cloudflare_access_identity_provider_otp_zone.yaml @@ -7,7 +7,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/identity_providers + url: https://api.cloudflare.com/client/v4/zones/0da42c8d2132a9ddaf714f9e7c920711/access/identity_providers?page=1&per_page=25 method: GET response: body: |