Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: use T.Setenv to set env vars in tests #1985

Merged
merged 1 commit into from
Oct 21, 2022
Merged

test: use T.Setenv to set env vars in tests #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1985.txt
View file
Open in desktop
@@ -0,0 +1,3 @@
```release-note:enhancement
test: use `T.Setenv` to set env vars in provider tests
```
5 changes: 1 addition & 4 deletions internal/provider/data_source_api_token_permission_groups_test.go
View file
Open in desktop
Expand Up @@ -14,10 +14,7 @@ func TestAccCloudflareApiTokenPermissionGroups(t *testing.T) {
// permission groups endpoint does not yet support the API tokens and it
// results in misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

resource.Test(t, resource.TestCase{
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/import_cloudflare_worker_route_test.go
View file
Open in desktop
Expand Up @@ -14,10 +14,7 @@ func TestAccCloudflareWorkerRoute_Import(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

var route cloudflare.WorkerRoute
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/import_cloudflare_worker_script_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccCloudflareWorkerScript_Import(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

var script cloudflare.WorkerScript
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/import_resource_cloudflare_ip_list_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccCloudflareIPList_Import(t *testing.T) {
// endpoint does not yet support the API tokens and it
// results in misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
10 changes: 2 additions & 8 deletions internal/provider/resource_cloudflare_access_bookmark_test.go
View file
Open in desktop
Expand Up @@ -16,10 +16,7 @@ func TestAccCloudflareAccessBookmark_Basic(t *testing.T) {
// endpoint does not yet support the API tokens for updates and it results in
// state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -107,10 +104,7 @@ func TestAccCloudflareAccessBookmark_WithZoneID(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_access_identity_provider_test.go
View file
Open in desktop
Expand Up @@ -53,10 +53,7 @@ func TestAccCloudflareAccessIdentityProvider_OneTimePin(t *testing.T) {
// endpoint does not yet support the API tokens for updates and it results in
// state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
10 changes: 2 additions & 8 deletions internal/provider/resource_cloudflare_access_keys_configuration_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccCloudflareAccessKeysConfiguration_WithKeyRotationIntervalDaysSet(t *
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -53,10 +50,7 @@ func TestAccCloudflareAccessKeysConfiguration_WithoutKeyRotationIntervalDaysSet(
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
10 changes: 2 additions & 8 deletions internal/provider/resource_cloudflare_access_mutual_tls_certificate_test.go
View file
Open in desktop
Expand Up @@ -64,10 +64,7 @@ func TestAccCloudflareAccessMutualTLSBasic(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -111,10 +108,7 @@ func TestAccCloudflareAccessMutualTLSBasicWithZoneID(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_access_policy_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccCloudflareAccessPolicy_ServiceToken(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
15 changes: 3 additions & 12 deletions internal/provider/resource_cloudflare_access_service_tokens_test.go
View file
Open in desktop
Expand Up @@ -17,10 +17,7 @@ func TestAccCloudflareAccessServiceTokenCreate(t *testing.T) {
// Service Tokens endpoint does not yet support the API tokens and it
// results in misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -67,10 +64,7 @@ func TestAccCloudflareAccessServiceTokenUpdate(t *testing.T) {
// Service Tokens endpoint does not yet support the API tokens and it
// results in misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -205,10 +199,7 @@ func TestAccCloudflareAccessServiceTokenDelete(t *testing.T) {
// Service Tokens endpoint does not yet support the API tokens and it
// results in misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_account_member_test.go
View file
Open in desktop
Expand Up @@ -12,10 +12,7 @@ func TestAccCloudflareAccountMemberBasic(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN as the API token won't have
// permission to manage account members.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_api_shield_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccAPIShield_Basic(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
30 changes: 6 additions & 24 deletions internal/provider/resource_cloudflare_api_token_test.go
View file
Open in desktop
Expand Up @@ -12,10 +12,7 @@ func TestAccAPIToken_Basic(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -46,10 +43,7 @@ func TestAccAPIToken_AllowDeny(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -77,10 +71,7 @@ func TestAccAPIToken_DoesNotSetConditions(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -121,10 +112,7 @@ func TestAccAPIToken_SetIndividualCondition(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -171,10 +159,7 @@ func TestAccAPIToken_SetAllCondition(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down Expand Up @@ -256,10 +241,7 @@ func TestAccAPIToken_TokenTTL(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the API token
// endpoint does not yet support the API tokens without an explicit scope.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_argo_tunnel_test.go
View file
Open in desktop
Expand Up @@ -16,10 +16,7 @@ func TestAccCloudflareArgoTunnelCreate(t *testing.T) {
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the Argo Tunnel
// endpoint does not yet support the API tokens.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

accID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
Expand Down
10 changes: 2 additions & 8 deletions internal/provider/resource_cloudflare_custom_hostname_fallback_origin_test.go
View file
Open in desktop
Expand Up @@ -16,10 +16,7 @@ func TestAccCloudflareCustomHostnameFallbackOrigin(t *testing.T) {
// fallback endpoint does not yet support the API tokens for updates and it
// results in state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

zoneID := os.Getenv("CLOUDFLARE_ZONE_ID")
Expand Down Expand Up @@ -65,10 +62,7 @@ func TestAccCloudflareCustomHostnameFallbackOriginUpdate(t *testing.T) {
// fallback endpoint does not yet support the API tokens for updates and it
// results in state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

zoneID := os.Getenv("CLOUDFLARE_ZONE_ID")
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_device_policy_test.go
View file
Open in desktop
Expand Up @@ -13,10 +13,7 @@ func TestAccCloudflareDevicePolicyCertificatesCreate(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down
5 changes: 1 addition & 4 deletions internal/provider/resource_cloudflare_device_posture_integration_test.go
View file
Open in desktop
Expand Up @@ -16,10 +16,7 @@ func TestAccCloudflareDevicePostureIntegrationCreate(t *testing.T) {
// service does not yet support the API tokens and it results in
// misleading state error messages.
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
defer func(apiToken string) {
os.Setenv("CLOUDFLARE_API_TOKEN", apiToken)
}(os.Getenv("CLOUDFLARE_API_TOKEN"))
os.Setenv("CLOUDFLARE_API_TOKEN", "")
t.Setenv("CLOUDFLARE_API_TOKEN", "")
}

rnd := generateRandomResourceName()
Expand Down