fix support for environment variables on Starter plan

UPDATING_OPENAPI_JSON.md

@@ -11,6 +11,8 @@ This project uses a modified `openapi.json`. Please maintain these instructions
 1. Remove the `domain` property from the `required` array of the `DnsZone` object.
 1. Remove the `values`, `scopes` and `is_secret` parameters from the `updateEnvVar` operation.
 1. Add a request body schema to the `updateEnvVar` operation, by copying it from an earlier version of the `openapi.json`.
+1. Remove `scopes` from the `required` array of the `updateEnvVar` operation request body.
+1. Remove `scopes` from the `required` array of the `EnvVar` object.
 1. Add a `package_path` property of type `string` to the `Repo` object.
 1. Add a `branch` property of type `string` to the `Repo` object.
 1. Add a `functions_region` property of type `string` to the `Site` object.

internal/netlifyapi/api/openapi.yaml

@@ -8398,7 +8398,6 @@ components:
  type: boolean
  required:
  - key
- - scopes
  - updated_at
  - updated_by
  - values
@@ -11965,7 +11964,6 @@ components:
  type: boolean
  requiredProperties:
  - values
- - scopes
  - is_secret
  uploadDeployFunction_200_response:
  example:

internal/provider/environment_variable_resource.go

@@ -52,6 +52,14 @@ type environmentVariableValueModel struct {
  ContextParameter types.String `tfsdk:"context_parameter"`
 }
 
+var allScopes = []string{"builds", "functions", "runtime", "post-processing"}
+var allScopesValues = []attr.Value{
+ types.StringValue("builds"),
+ types.StringValue("functions"),
+ types.StringValue("runtime"),
+ types.StringValue("post-processing"),
+}
+
 func (r *environmentVariableResource) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
  resp.TypeName = req.ProviderTypeName + "_environment_variable"
 }
@@ -110,15 +118,10 @@ func (r *environmentVariableResource) Schema(_ context.Context, _ resource.Schem
  Description: "One or more of builds, functions, runtime, and post-processing",
  Validators: []validator.Set{
  setvalidator.ValueStringsAre(
- stringvalidator.OneOf("builds", "functions", "runtime", "post-processing"),
+ stringvalidator.OneOf(allScopes...),
  ),
  },
- Default: setdefault.StaticValue(types.SetValueMust(types.StringType, []attr.Value{
- types.StringValue("builds"),
- types.StringValue("functions"),
- types.StringValue("runtime"),
- types.StringValue("post-processing"),
- })),
+ Default: setdefault.StaticValue(types.SetValueMust(types.StringType, allScopesValues)),
  },
  "values": schema.SetNestedAttribute{
  Optional: true,
@@ -204,6 +207,9 @@ func (r *environmentVariableResource) Create(ctx context.Context, req resource.C
  for i, scope := range plan.Scopes {
  scopes[i] = scope.ValueString()
  }
+ if hasAllScopes(scopes) {
+ scopes = nil
+ }
  var values []netlifyapi.EnvVarValue
  var isSecret bool
  if len(plan.SecretValues) > 0 {
@@ -306,6 +312,9 @@ func (r *environmentVariableResource) Update(ctx context.Context, req resource.U
  for i, scope := range plan.Scopes {
  scopes[i] = scope.ValueString()
  }
+ if hasAllScopes(scopes) {
+ scopes = nil
+ }
  var values []netlifyapi.EnvVarValue
  var isSecret bool
  if len(plan.SecretValues) > 0 {
@@ -431,3 +440,19 @@ func parseValues(values []netlifyapi.EnvVarValue) []environmentVariableValueMode
  }
  return envVarValues
 }
+
+func hasAllScopes(scopes []string) bool {
+ for _, scope := range allScopes {
+ found := false
+ for _, s := range scopes {
+ if s == scope {
+ found = true
+ break
+ }
+ }
+ if !found {
+ return false
+ }
+ }
+ return true
+}

internal/provider/environment_variable_resource_test.go

@@ -100,6 +100,7 @@ resource "netlify_environment_variable" "b" {
  team_id = "66ae34e11a567e9092e3850f"
  site_id = "5b407d6d-9385-4e7a-a4c4-8efc11ea3c26"
  key = "C_B"
+ scopes = ["builds", "functions", "runtime", "post-processing"]
  values = [
  {
  value = "staging"

internal/provider/starter_plan_test.go

@@ -0,0 +1,32 @@
+package provider
+
+import (
+ "testing"
+
+ "github.com/hashicorp/terraform-plugin-testing/helper/resource"
+ "github.com/hashicorp/terraform-plugin-testing/terraform"
+)
+
+func TestAccStarterEnvVar(t *testing.T) {
+ accTest(t, []resource.TestStep{
+ {
+ Config: `resource "netlify_environment_variable" "site_level" {
+ team_id = "66e98216e3fe031846dc998a"
+ site_id = "fbba82b0-f1e9-4e92-9203-eefc62857545"
+ key = "TEST_SITE_LEVEL"
+ values = [
+ {
+ value = "/path/here",
+ context = "all",
+ }
+ ]
+}
+`,
+ Check: resource.ComposeAggregateTestCheckFunc(
+ resource.TestCheckResourceAttr("netlify_environment_variable.site_level", "team_id", "66e98216e3fe031846dc998a"),
+ resource.TestCheckResourceAttr("netlify_environment_variable.site_level", "site_id", "fbba82b0-f1e9-4e92-9203-eefc62857545"),
+ resource.TestCheckResourceAttr("netlify_environment_variable.site_level", "key", "TEST_SITE_LEVEL"),
+ ),
+ },
+ }, func(s *terraform.State) error { return nil })
+}

openapi.json

@@ -3440,7 +3440,6 @@
  },
  "requiredProperties": [
  "values",
- "scopes",
  "is_secret"
  ]
  }
@@ -10948,7 +10947,6 @@
  },
  "required": [
  "key",
- "scopes",
  "values",
  "updated_at",
  "updated_by"