- Augmented mocked registry.

Author: general-kroll-4-life

.vscode/launch.json

@@ -177,6 +177,7 @@
         "delete from aws.cloud_control.resources  where  region = 'ap-southeast-1'  and data__TypeName = 'AWS::Logs::LogGroup'  and data__Identifier = 'LogGroupResourceExampleThird' ;",
         "insert into google.storage.buckets( project, data__name) select  'testing-project', 'silly-bucket' returning projectNumber;",
         "insert /*+ AWAIT */ into google.compute.networks(project, data__name, data__autoCreateSubnetworks) select 'mutable-project', 'auto-test-01', false returning creationTimestamp, name;",
+        "registry pull google 'v0.1.2'; show resources in google.storage; registry pull google 'v0.1.1-alpha01'; show resources in google.storage; registry pull google 'v0.1.0'; show resources in google.storage;",
       ],
       "default": "show providers;"
     },
@@ -195,7 +196,8 @@
         "{ \"url\": \"https://cdn.statically.io/gh/stackql/stackql-provider-registry/main/providers\", \"localDocRoot\": \"${workspaceFolder}/test/registry\" }",
         "{ \"url\": \"https://cdn.statically.io/gh/stackql/stackql-provider-registry/dev/providers\" }",
         "{ \"url\": \"https://registry-dev.stackql.app/providers\" }",
-        "{ \"url\": \"https://registry.stackql.app/providers\" }"
+        "{ \"url\": \"https://registry.stackql.app/providers\" }",
+        "{\"url\": \"http://localhost:1094/gh/stackql/stackql-provider-registry/main/providers\", \"verifyConfig\": {\"nopVerify\": true}}",
       ],
       "default": "{ \"url\": \"file://${workspaceFolder}/test/registry\", \"localDocRoot\": \"${workspaceFolder}/test/registry\", \"verifyConfig\": { \"nopVerify\": true } }"
     },

internal/stackql/handler/handler.go

@@ -48,6 +48,7 @@ type HandlerContext interface { //nolint:revive // don't mind stuttering this on
 	GetAuthContext(providerName string) (*dto.AuthCtx, error)
 	GetDBMSInternalRouter() dbmsinternal.Router
 	GetProvider(providerName string) (provider.IProvider, error)
+	DeleteProvider(providerName string) error
 	GetSupportedProviders(extended bool) (map[string]map[string]interface{}, error)
 	LogHTTPResponseMap(target interface{})
 	//
@@ -286,6 +287,23 @@ func (hc *standardHandlerContext) GetASTFormatter() sqlparser.NodeFormatter {
 	return hc.formatter
 }
 
+func (hc *standardHandlerContext) DeleteProvider(providerName string) error {
+	hc.providersMapMutex.Lock()
+	defer hc.providersMapMutex.Unlock()
+	if providerName == "googleapis.com" {
+		providerName = "google"
+	}
+	if providerName == "" {
+		return fmt.Errorf("provider name cannot be empty")
+	}
+	_, ok := hc.providers[providerName]
+	if len(hc.providers) == 0 || !ok {
+		return fmt.Errorf("provider '%s' not found", providerName)
+	}
+	delete(hc.providers, providerName)
+	return nil
+}
+
 func (hc *standardHandlerContext) GetProvider(providerName string) (provider.IProvider, error) {
 	var err error
 	if providerName == "" {

internal/stackql/planbuilder/plan_builder.go

@@ -752,6 +752,8 @@ func (pgb *standardPlanGraphBuilder) handleRegistryPull(
 	if err = reg.ClearProviderCache(providerID); err != nil {
 		return internaldto.NewErroneousExecutorOutput(err)
 	}
+	handlerCtx := pbi.GetHandlerCtx()
+	_ = handlerCtx.DeleteProvider(providerID)
 	// Pull and persist the requested version
 	if err = reg.PullAndPersistProviderArchive(node.ProviderId, providerVersion); err != nil {
 		return internaldto.NewErroneousExecutorOutput(err)

test/python/stackql_test_tooling/flask/registry/expectations.json

@@ -37,5 +37,18 @@
       "status": 200,
       "file": "google-v0.1.1-alpha01.tgz"
     }
+  },
+  {
+    "httpRequest": {
+      "method": "GET",
+      "path": "/gh/stackql/stackql-provider-registry/main/providers/dist/googleapis.com/v0.1.0.tgz"
+    },
+    "httpResponse": {
+      "headers": {
+        "Content-Type": "application/gzip"
+      },
+      "status": 200,
+      "file": "google-v0.1.0.tgz" 
+    }
   }
 ]

test/robot/functional/stackql_mocked_from_cmd_line.robot

@@ -2742,8 +2742,8 @@ Registry Pull Overwrite Works in Both Directions
     ...    ${inputStr} 
     ...    ${stdOutStr}
     ...    ${stdErrStr}
-    stdout=${CURDIR}/tmp/Registry-Pull-Override-Works-in-Both-Directions.tmp
-    stderr=${CURDIR}/tmp/Registry-Pull-Override-Works-in-Both-Directions-stderr.tmp    
+    ...    stdout=${CURDIR}/tmp/Registry-Pull-Override-Works-in-Both-Directions.tmp
+    ...    stderr=${CURDIR}/tmp/Registry-Pull-Override-Works-in-Both-Directions-stderr.tmp    
 
 Registry Pull Google Provider Implicit Latest Version
     Should Stackql Exec Inline Contain Both Streams