Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"options": [
"{ \"url\": \"file://${workspaceFolder}/test/registry-sandbox\", \"localDocRoot\": \"${workspaceFolder}/test/registry-sandbox\", \"verifyConfig\": { \"nopVerify\": true } }",
"{ \"url\": \"file://${workspaceFolder}/test/registry\", \"localDocRoot\": \"${workspaceFolder}/test/registry\", \"verifyConfig\": { \"nopVerify\": true } }",
"{ \"url\": \"https://cdn.statically.io/gh/stackql/stackql-provider-registry/feature/github-v-0-3-0/providers\" }",
"{ \"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/feature/add-github-provider-published-05/providers\" }"
],
"default": "{ \"url\": \"file://${workspaceFolder}/test/registry-sandbox\", \"localDocRoot\": \"${workspaceFolder}/test/registry-sandbox\", \"verifyConfig\": { \"nopVerify\": true } }"
Expand Down Expand Up @@ -583,6 +583,7 @@
"mode": "debug",
"program": "${workspaceFolder}/stackql",
"args": [
"--registry=${input:registryString}",
"exec",
"show extended resources from google.compute where name = 'resourcePolicies';",
"-o",
Expand Down Expand Up @@ -733,14 +734,15 @@
],
},
{
"name": "SHOW RESOURCES... ;\" -- prebuilt with cmake",
"name": "SHOW RESOURCES... ;\"",
"type": "go",
"request": "launch",
"mode": "exec",
"program": "${workspaceFolder}/build/stackql",
"mode": "debug",
"program": "${workspaceFolder}/stackql",
"args": [
"exec",
"--auth=${input:authString}",
"--registry=${input:registryString}",
"show resources from google.container;",
"-o",
"table"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.1
github.com/stackql/go-openapistackql v0.0.7-gamma04
github.com/stackql/go-openapistackql v0.0.7-gamma08
github.com/stackql/go-sqlite3 v0.0.1-stackqlrc01
github.com/stackql/go-suffix-map v0.0.1-alpha01
go.uber.org/zap v1.21.0
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,12 @@ github.com/stackql/go-openapistackql v0.0.7-beta04 h1:vSWw4dGCj5tGEa4qBpRrsuGYOd
github.com/stackql/go-openapistackql v0.0.7-beta04/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-openapistackql v0.0.7-gamma04 h1:7dUM/tlHTT/jB89MVsSM6/lLfMjVNd/i6yYRkNfVmWk=
github.com/stackql/go-openapistackql v0.0.7-gamma04/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-openapistackql v0.0.7-gamma05 h1:WpEyS76B8iVNasltinq/a589n8vuMp4yXd4nPeVgAYY=
github.com/stackql/go-openapistackql v0.0.7-gamma05/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-openapistackql v0.0.7-gamma07 h1:yTGp6cxOC4myoKK1cbOkkmKv2sXsz7drK6pQm1QhfMU=
github.com/stackql/go-openapistackql v0.0.7-gamma07/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-openapistackql v0.0.7-gamma08 h1:i5dePT4yQ2SNdstw1VgmSgvv+PGZmJKyhSCTNCxfsuA=
github.com/stackql/go-openapistackql v0.0.7-gamma08/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-spew v1.1.3-alpha24 h1:yNmgWU+OKU8SvlQ0umiQWWgWS6C5U1GuRMlYfQgbmJA=
github.com/stackql/go-spew v1.1.3-alpha24/go.mod h1:o2MPqg2ee1PN4SxAh9zQSJJmKKFJjpro9pejdK7dXWk=
github.com/stackql/go-sqlite3 v0.0.1-stackqlrc01 h1:q+LfCfPrIqqG5+v9T5xjyYzOEBB4i77Ek10Lzwyd0D4=
Expand Down
21 changes: 14 additions & 7 deletions internal/stackql/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,34 @@ type HandlerContext struct {
TxnCounterMgr *txncounter.TxnCounterManager
}

func getProviderMap(providerName string) map[string]interface{} {
func getProviderMap(providerName string, providerDesc openapistackql.ProviderDescription) map[string]interface{} {
latestVersion, err := providerDesc.GetLatestVersion()
if err != nil {
latestVersion = fmt.Sprintf("could not infer latest version due to error. Suggested action is that you wipe the local provider directory. Error = '%s'", err.Error())
}
googleMap := map[string]interface{}{
"name": providerName,
"name": providerName,
"version": latestVersion,
}
return googleMap
}

func getProviderMapExtended(providerName string) map[string]interface{} {
return getProviderMap(providerName)
func getProviderMapExtended(providerName string, providerDesc openapistackql.ProviderDescription) map[string]interface{} {
return getProviderMap(providerName, providerDesc)
}

func (hc *HandlerContext) GetSupportedProviders(extended bool) map[string]map[string]interface{} {
retVal := make(map[string]map[string]interface{})
for pn := range hc.Registry.ListLocallyAvailableProviders() {
provs := hc.Registry.ListLocallyAvailableProviders()
for k, pd := range provs {
pn := k
if pn == "googleapis.com" {
pn = "google"
}
if extended {
retVal[pn] = getProviderMapExtended(pn)
retVal[pn] = getProviderMapExtended(pn, pd)
} else {
retVal[pn] = getProviderMap(pn)
retVal[pn] = getProviderMap(pn, pd)
}
}
return retVal
Expand Down
2 changes: 1 addition & 1 deletion internal/stackql/planbuilder/primitive_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func (pb *primitiveGenerator) showInstructionExecutor(node *sqlparser.Show, hand
if len(keys) == 0 {
rv = util.EmptyProtectResultSet(
rv,
[]string{"name"},
[]string{"name", "version"},
)
}
return rv
Expand Down
1 change: 1 addition & 0 deletions test/robot/functional/stackql_from_cmd_line.robot
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Positive Control

Get Providers
Should StackQL Exec Contain ${SHOW_PROVIDERS_STR} okta
Should StackQL Novel Exec Contain ${SHOW_PROVIDERS_STR} v0.3.1
Should StackQL Exec Contain JSON output ${SHOW_PROVIDERS_STR} okta

Get Providers No Config
Expand Down