beatzaplenty/terraform-provider-dynu
Archived
1
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Require provider api_key and remove env var fallback

Browse Source
This commit is contained in:
beatz174-bit committed 2026-05-04 01:21:53 +10:00
1 parent 2b0c058664
commit a317b5f0ce
13 files changed
+22 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/provider/provider.go
+5 -6
View File
@@ -2,7 +2,6 @@ package provider
import (
"context"
"os"
"strings"
"github.com/hashicorp/terraform-plugin-framework/datasource"
@@ -48,7 +47,7 @@ func (p *dynuProvider) Schema(_ context.Context, _ provider.SchemaRequest, resp
"api_key": schema.StringAttribute{
Optional: true,
Sensitive: true,
Description: "Dynu API key. If omitted, the provider uses the DYNU_API_KEY environment variable.",
Description: "Dynu API key. Set this explicitly, such as via a Terraform variable in terraform.tfvars.",
},
"base_url": schema.StringAttribute{
Optional: true,
@@ -66,12 +65,12 @@ func (p *dynuProvider) Configure(ctx context.Context, req provider.ConfigureRequ
return
}
apiKey := resolveAPIKey(data.APIKey, os.Getenv("DYNU_API_KEY"))
apiKey := resolveAPIKey(data.APIKey)
if apiKey == "" {
resp.Diagnostics.AddAttributeError(
path.Root("api_key"),
"Missing Dynu API key",
"Configure api_key in the provider block or set the DYNU_API_KEY environment variable.",
"Configure api_key in the provider block (for example, from var.dynu_api_key set in terraform.tfvars).",
)
return
}
@@ -81,11 +80,11 @@ func (p *dynuProvider) Configure(ctx context.Context, req provider.ConfigureRequ
resp.ResourceData = providerData
}
func resolveAPIKey(configValue types.String, envValue string) string {
func resolveAPIKey(configValue types.String) string {
if !configValue.IsNull() && !configValue.IsUnknown() {
return strings.TrimSpace(configValue.ValueString())
}
return strings.TrimSpace(envValue)
return ""
}
func (p *dynuProvider) DataSources(_ context.Context) []func() datasource.DataSource {
internal/provider/provider_test.go
+5 -7
View File
@@ -16,19 +16,17 @@ func TestResolveAPIKey(t *testing.T) {
tests := []struct {
name string
config types.String
env string
want string
}{
{name: "config wins", config: types.StringValue("config-key"), env: "env-key", want: "config-key"},
{name: "env fallback", config: types.StringNull(), env: "env-key", want: "env-key"},
{name: "trim spaces", config: types.StringValue(" config-key "), env: " env-key ", want: "config-key"},
{name: "unknown uses env", config: types.StringUnknown(), env: "env-key", want: "env-key"},
{name: "empty when missing", config: types.StringNull(), env: "", want: ""},
{name: "configured", config: types.StringValue("config-key"), want: "config-key"},
{name: "null when missing", config: types.StringNull(), want: ""},
{name: "trim spaces", config: types.StringValue(" config-key "), want: "config-key"},
{name: "unknown when pending", config: types.StringUnknown(), want: ""},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if got := resolveAPIKey(tc.config, tc.env); got != tc.want {
if got := resolveAPIKey(tc.config); got != tc.want {
t.Fatalf("resolveAPIKey() = %q, want %q", got, tc.want)
}
})