- Registry file location works locally.

Author: general-kroll-4-life

.vscode/launch.json

@@ -153,9 +153,10 @@
         "set global \"a.b\"=1;",
         "set global \"$.auth.google.sub\"='[email protected]';",
         "select JSON_EXTRACT(saml.samlIdentity, '$.username') as saml_username from github.scim.saml_ids saml where saml.org = 'dummyorg';",
-        "select kind, name, maximumCardsPerInstance from google.compute.acceleratorTypes where project = 'defective-response-content-project' and zone = 'australia-southeast1-a' order by name desc;"
+        "select kind, name, maximumCardsPerInstance from google.compute.acceleratorTypes where project = 'defective-response-content-project' and zone = 'australia-southeast1-a' order by name desc;",
+        "registry pull google;"
       ],
-      "default": "show providers;"
+      "default": "registry pull google;"
     },
     {
       "type": "pickString",
@@ -197,6 +198,16 @@
         "-tags=sqlite_stackql"
       ]
     },
+    {
+      "type": "pickString",
+      "id": "appRoot",
+      "description": "Extra Build Flags for debug; cannot place elsewhere",
+      "default": "${workspaceFolder}",
+      "options": [
+        "${workspaceFolder}",
+        "${workspaceFolder}/test/tmp/.vscode.debug.stackql",
+      ]
+    },
     {
       "type": "pickString",
       "id": "concurrencyLimit",
@@ -393,6 +404,7 @@
         "--dataflow.dependency.max=${input:dataflowDependencyMax}",
         "--dataflow.components.max=${input:dataflowComponentsMax}",
         "--http.log.enabled=${input:httpLogEnabled}",
+        "--approot=${input:appRoot}",
         "${input:queryString}"
       ],
     },

internal/stackql/cmd/exec.go

@@ -52,6 +52,9 @@ stackql exec -i iqlscripts/create-disk.iql --credentialsfilepath /mnt/c/tmp/stac
 		var err error
 		var rdr io.Reader
 
+		flagErr := dependentFlagHandler(&runtimeCtx)
+		iqlerror.PrintErrorAndExitOneIfError(flagErr)
+
 		if runtimeCtx.CPUProfile != "" {
 			var f *os.File
 			f, err = os.Create(runtimeCtx.CPUProfile)

internal/stackql/cmd/registry.go

@@ -45,6 +45,9 @@ var registryCmd = &cobra.Command{
 
 		var rdr io.Reader
 
+		flagErr := dependentFlagHandler(&runtimeCtx)
+		iqlerror.PrintErrorAndExitOneIfError(flagErr)
+
 		usagemsg := cmd.Long + "\n\n" + cmd.UsageString()
 		if len(args) < 1 {
 			iqlerror.PrintErrorAndExitOneWithMessage(usagemsg)

internal/stackql/cmd/root.go

@@ -83,6 +83,24 @@ WHERE project = 'my-project' AND zone = 'us-west1-b';`,
 	},
 }
 
+func dependentFlagHandler(rc *dto.RuntimeCtx) error {
+	inferredReqistryRaw := fmt.Sprintf(
+		`{ "url": "%s", "localDocRoot": "%s", "verifyConfig": { "nopVerify": true } }`,
+		defaultRegistryURLString,
+		strings.ReplaceAll(path.Join(runtimeCtx.ApplicationFilesRootPath), `\`, `\\`),
+	)
+	if rc.RegistryRaw == "" {
+		setErr := rc.Set(
+			dto.RegistryRawKey,
+			inferredReqistryRaw,
+		)
+		if setErr != nil {
+			return setErr
+		}
+	}
+	return nil
+}
+
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() error {
@@ -118,7 +136,13 @@ func init() {
 	rootCmd.PersistentFlags().Uint32Var(&runtimeCtx.ApplicationFilesRootPathMode, dto.ApplicationFilesRootPathModeKey, config.GetDefaultProviderCacheDirFileMode(), "Application config and cache file mode")
 	rootCmd.PersistentFlags().StringVar(&runtimeCtx.ViperCfgFileName, dto.ViperCfgFileNameKey, config.GetDefaultViperConfigFileName(), "Config filename")
 	rootCmd.PersistentFlags().StringVar(&runtimeCtx.AuthRaw, dto.AuthCtxKey, "", `auth contexts keyvals in json form, eg: '{ "google": { "credentialsfilepath": "/path/to/google/sevice/account/key.json",  "type": "service_account" }, "okta": { "credentialsenvvar": "OKTA_SECRET_KEY",  "type": "api_key" } }'`)
-	rootCmd.PersistentFlags().StringVar(&runtimeCtx.RegistryRaw, dto.RegistryRawKey, fmt.Sprintf(`{ "url": "%s", "localDocRoot": "%s", "verifyConfig": { "nopVerify": true } }`, defaultRegistryURLString, strings.ReplaceAll(path.Join(runtimeCtx.ApplicationFilesRootPath), `\`, `\\`)), fmt.Sprintf(`openapi registry context keyvals in json form, eg: '{ "url": "%s" }'.`, defaultRegistryURLString))
+	rootCmd.PersistentFlags().StringVar(
+		&runtimeCtx.RegistryRaw,
+		dto.RegistryRawKey,
+		"",
+		fmt.Sprintf(`openapi registry context keyvals in json form, eg: '{ "url": "%s" }'.`, defaultRegistryURLString),
+	)
+	fmt.Fprintf(os.Stderr, "Init: RegistryRaw: %s\n", runtimeCtx.RegistryRaw) //nolint:forbidigo // legacy
 	rootCmd.PersistentFlags().BoolVar(&runtimeCtx.HTTPLogEnabled, dto.HTTPLogEnabledKey, false, "Display http request info in terminal")
 	rootCmd.PersistentFlags().IntVar(&runtimeCtx.HTTPMaxResults, dto.HTTPMaxResultsKey, -1, "Max results per http request, any number <=0 results in no limitation")
 	rootCmd.PersistentFlags().IntVar(&runtimeCtx.HTTPPageLimit, dto.HTTPPAgeLimitKey, 20, "Max pages of results that will be returned per resource, any number <=0 results in no limitation") //nolint:mnd // TODO: investigate

internal/stackql/cmd/shell.go

@@ -111,6 +111,9 @@ var shellCmd = &cobra.Command{
 	//nolint:revive // acceptable for now
 	Run: func(command *cobra.Command, args []string) {
 
+		flagErr := dependentFlagHandler(&runtimeCtx)
+		iqlerror.PrintErrorAndExitOneIfError(flagErr)
+
 		cd := presentation.NewPresentationDriver(runtimeCtx)
 
 		outfile, _ := writer.GetDecoratedOutputWriter(runtimeCtx.OutfilePath, cd)

internal/stackql/cmd/srv.go

@@ -39,6 +39,8 @@ var srvCmd = &cobra.Command{
   `,
 	//nolint:revive // acceptable for now
 	Run: func(cmd *cobra.Command, args []string) {
+		flagErr := dependentFlagHandler(&runtimeCtx)
+		iqlerror.PrintErrorAndExitOneIfError(flagErr)
 		inputBundle, err := entryutil.BuildInputBundle(runtimeCtx)
 		iqlerror.PrintErrorAndExitOneIfError(err)
 		handlerCtx, err := entryutil.BuildHandlerContextNoPreProcess(runtimeCtx, queryCache, inputBundle)

internal/stackql/handler/handler.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"os"
 	"path"
 	"strings"
 	"sync"
@@ -462,6 +463,8 @@ func getRegistry(runtimeCtx dto.RuntimeCtx) (anysdk.RegistryAPI, error) {
 	if err != nil {
 		return nil, err
 	}
+	fmt.Fprintf(os.Stderr, "App root path: %s\n", runtimeCtx.ApplicationFilesRootPath)
+	fmt.Fprintf(os.Stderr, "Registry LocalDocRoot: %s\n", rc.LocalDocRoot)
 	if rc.LocalDocRoot == "" {
 		if strings.HasPrefix(rc.RegistryURL, "file:") {
 			rc.LocalDocRoot = path.Clean(path.Join(strings.TrimPrefix(rc.RegistryURL, "file:"), ".."))