overrideOptionsFromExtraEnv: skip unknown keys in extraEnv earlier

Author: johnstcn

internal/provider/helpers.go

@@ -164,6 +164,12 @@ func overrideOptionsFromExtraEnv(opts *eboptions.Options, extraEnv map[string]st
 		optsMap[opt.Env] = opt.Value
 	}
 	for key, val := range extraEnv {
+		opt, found := optsMap[key]
+		if !found {
+			// ignore unknown keys
+			continue
+		}
+
 		if _, found := nonOverrideOptions[key]; found {
 			diags.AddAttributeWarning(path.Root("extra_env"),
 				"Cannot override required environment variable",
@@ -186,12 +192,6 @@ func overrideOptionsFromExtraEnv(opts *eboptions.Options, extraEnv map[string]st
 			_ = optsMap[key].Set("")
 		}
 
-		opt, found := optsMap[key]
-		if !found {
-			// ignore unknown keys
-			continue
-		}
-
 		if err := opt.Set(val); err != nil {
 			diags.AddAttributeError(path.Root("extra_env"),
 				"Invalid value for environment variable",