Add FQN for filestate and simply output

pulumi · Nov 18, 2022 · c0c0455 · c0c0455
1 parent 525b37e
commit c0c0455
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/pkg/backend/filestate/backend.go b/pkg/backend/filestate/backend.go
@@ -99,9 +99,8 @@ func (r localBackendReference) Name() tokens.Name {
 	return r.name
 }
 
-func (c localBackendReference) FullyQualifiedName() tokens.Name {
-	// TODO[pulumi/pulumi#11390]: Unable to provide this value until we solve this issue.
-	return tokens.Name("")
+func (r localBackendReference) FullyQualifiedName() tokens.Name {
+	return r.Name()
 }
 
 func IsFileStateBackendURL(urlstr string) bool {

diff --git a/pkg/cmd/pulumi/about.go b/pkg/cmd/pulumi/about.go
@@ -86,17 +86,16 @@ type summaryAbout struct {
 	// We use pointers here to allow the field to be nullable. When
 	// constructing, we either fill in a field or add an error. We still
 	// indicate that the field should be present when we serialize the struct.
-	Plugins        []pluginAbout            `json:"plugins"`
-	Host           *hostAbout               `json:"host"`
-	Backend        *backendAbout            `json:"backend"`
-	CurrentStack   *currentStackAbout       `json:"currentStack"`
-	CLI            *cliAbout                `json:"cliAbout"`
-	Runtime        *projectRuntimeAbout     `json:"runtime"`
-	Dependencies   []programDependencyAbout `json:"dependencies"`
-	ErrorMessages  []string                 `json:"errors"`
-	StackReference string                   `json:"stackReference"`
-	Errors         []error                  `json:"-"`
-	LogMessage     string                   `json:"-"`
+	Plugins       []pluginAbout            `json:"plugins"`
+	Host          *hostAbout               `json:"host"`
+	Backend       *backendAbout            `json:"backend"`
+	CurrentStack  *currentStackAbout       `json:"currentStack"`
+	CLI           *cliAbout                `json:"cliAbout"`
+	Runtime       *projectRuntimeAbout     `json:"runtime"`
+	Dependencies  []programDependencyAbout `json:"dependencies"`
+	ErrorMessages []string                 `json:"errors"`
+	Errors        []error                  `json:"-"`
+	LogMessage    string                   `json:"-"`
 }
 
 func getSummaryAbout(ctx context.Context, transitiveDependencies bool, selectedStack string) summaryAbout {
@@ -427,12 +426,11 @@ func (current currentStackAbout) String() string {
 			Rows:    rows,
 		}.String() + "\n"
 	}
-	return fmt.Sprintf(`Current Stack: %s
-
-Fully qualified stack name: %s
-
-%s
-%s`, current.Name, current.FullyQualifiedName, resources, pending)
+	stackName := current.Name
+	if stackName != current.FullyQualifiedName {
+		stackName += fmt.Sprintf(" (fully qualified to %q)", current.FullyQualifiedName)
+	}
+	return fmt.Sprintf("Current Stack: %s\n\n%s\n%s", stackName, resources, pending)
 }
 
 func simpleTableRows(arr [][]string) []cmdutil.TableRow {