Merge branch 'main' of github.com:deta/pc-cli into new-fields

deta · Oct 3, 2023 · 2113148 · 2113148
2 parents 8254475 + 77e08c4
commit 2113148
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cmd/release.go b/cmd/release.go
@@ -87,13 +87,12 @@ func newCmdRelease() *cobra.Command {
 				}
 			}
 
-			spacefile, err := spacefile.LoadSpacefile(projectDir)
+			sf, err := spacefile.LoadSpacefile(projectDir)
 			if err != nil {
 				utils.Logger.Printf("Failed to load Spacefile: %v", err)
 				return err
 			}
-
-			discoveryData, err := getDiscoveryData(projectDir, spacefile)
+			discoveryData, err := getDiscoveryData(projectDir, sf)
 			if err != nil {
 				return fmt.Errorf("failed to get Discovery data, %w", err)
 			}
@@ -144,7 +143,7 @@ func newCmdRelease() *cobra.Command {
 
 			utils.Logger.Printf(getCreatingReleaseMsg(listedRelease, useLatestRevision))
 			err = release(projectDir, projectID, revisionID, releaseVersion,
-				listedRelease, releaseNotes, discoveryData, *spacefile.AutoPWA)
+				listedRelease, releaseNotes, discoveryData, *sf.AutoPWA)
 			if err != nil {
 				return err
 			}

diff --git a/internal/spacefile/spacefile.go b/internal/spacefile/spacefile.go
@@ -272,6 +272,10 @@ func LoadSpacefile(projectDir string) (*Spacefile, error) {
 		spacefile.AutoPWA = new(bool)
 		*spacefile.AutoPWA = true
 	}
+	if spacefile.AutoPWA == nil {
+		spacefile.AutoPWA = new(bool)
+		*spacefile.AutoPWA = true
+	}
 
 	foundPrimaryMicro := false
 	micros := make(map[string]struct{})