Merge pull request #503 from hmlanigan/fix-cli-discovery

fix: live discovery of data needed for juju
juju · Jun 20, 2024 · e2e123d · e2e123d
2 parents 0931bec + c02077e
commit e2e123d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -60,6 +60,9 @@ func jujuProviderModelEnvVar() jujuProviderModel {
 func jujuProviderModelLiveDiscovery() (jujuProviderModel, bool) {
 	data := jujuProviderModel{}
 	controllerConfig, cliNotExist := juju.GetLocalControllerConfig()
+	if cliNotExist {
+		return data, false
+	}
 
 	if ctrlAddrs, ok := controllerConfig[JujuControllerEnvKey]; ok && ctrlAddrs != "" {
 		data.ControllerAddrs = types.StringValue(ctrlAddrs)
@@ -73,7 +76,7 @@ func jujuProviderModelLiveDiscovery() (jujuProviderModel, bool) {
 	if password, ok := controllerConfig[JujuPasswordEnvKey]; ok && password != "" {
 		data.Password = types.StringValue(password)
 	}
-	return data, cliNotExist
+	return data, true
 }
 
 func getEnvVar(field string) types.String {

diff --git a/internal/provider/resource_application.go b/internal/provider/resource_application.go
@@ -26,7 +26,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/juju/errors"
-
 	"github.com/juju/juju/core/constraints"
 
 	"github.com/juju/terraform-provider-juju/internal/juju"