Remove 'steampipe_command' schema and move settings and scan_metadata foreign tables to 'steampipe_internal' schema. Closes #310

Author: kaidaguerre

fdw.go

@@ -125,7 +125,7 @@ func goFdwGetPathKeys(state *C.FdwPlanState) *C.List {
 	// get the connection name - this is the namespace (i.e. the local schema)
 	opts["connection"] = getNamespace(rel)
 
-	if opts["connection"] == constants.CommandSchema {
+	if opts["connection"] == constants.InternalSchema {
 		return result
 	}
 
@@ -389,7 +389,7 @@ func goFdwImportForeignSchema(stmt *C.ImportForeignSchemaStmt, serverOid C.Oid)
 		}
 	}()
 
-	log.Printf("[WARN] goFdwImportForeignSchema remote '%s' local '%s'\n", C.GoString(stmt.remote_schema), C.GoString(stmt.local_schema))
+	log.Printf("[INFO] goFdwImportForeignSchema remote '%s' local '%s'\n", C.GoString(stmt.remote_schema), C.GoString(stmt.local_schema))
 	// get the plugin hub,
 	pluginHub, err := hub.GetHub()
 	if err != nil {
@@ -402,9 +402,10 @@ func goFdwImportForeignSchema(stmt *C.ImportForeignSchemaStmt, serverOid C.Oid)
 	localSchema := C.GoString(stmt.local_schema)
 
 	// special handling for the command schema
-	if remoteSchema == constants.CommandSchema {
-		commandSchema := pluginHub.GetCommandSchema()
-		sql := SchemaToSql(commandSchema, stmt, serverOid)
+	if remoteSchema == constants.InternalSchema {
+		log.Printf("[INFO] importing setting tables into steampipe_internal schema")
+		settingsSchema := pluginHub.GetSettingsSchema()
+		sql := SchemaToSql(settingsSchema, stmt, serverOid)
 		return sql
 	}
 
@@ -435,7 +436,7 @@ func goFdwExecForeignInsert(estate *C.EState, rinfo *C.ResultRelInfo, slot *C.Tu
 	defer C.RelationClose(rel)
 	connection := getNamespace(rel)
 	// if this is a command insert, handle it
-	if connection == constants.CommandSchema {
+	if connection == constants.InternalSchema {
 		return handleCommandInsert(rinfo, slot, rel)
 	}
 

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/turbot/go-kit v0.6.0-alpha.1
-	// schema_import
-	github.com/turbot/steampipe v1.7.0-rc.0.0.20230515091940-efbd4045e27e
+	// remove_steampipe_command
+	github.com/turbot/steampipe v1.7.0-rc.0.0.20230516153230-a938a696d29e
 	github.com/turbot/steampipe-plugin-sdk/v5 v5.4.1
 	go.opentelemetry.io/otel v1.10.0
 	google.golang.org/protobuf v1.30.0

go.sum

@@ -904,8 +904,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/tombuildsstuff/giovanni v0.15.1/go.mod h1:0TZugJPEtqzPlMpuJHYfXY6Dq2uLPrXf98D2XQSxNbA=
 github.com/turbot/go-kit v0.6.0-alpha.1 h1:mm1QpkwknuJQfA7oKzyzMiDRx5GsKlzxwsNa7n+Ttj4=
 github.com/turbot/go-kit v0.6.0-alpha.1/go.mod h1:oP9gLk6bETL4nkEuujZZbOlcv9jnHQlf7DYcI/+Ke8Q=
-github.com/turbot/steampipe v1.7.0-rc.0.0.20230515091940-efbd4045e27e h1:A5F7NT23yBROgPkJXE+pxRQomFTS8S+kZblREJ1CALQ=
-github.com/turbot/steampipe v1.7.0-rc.0.0.20230515091940-efbd4045e27e/go.mod h1:sDC02Vc5RYn/FqZ3vpuWlMqmawR7J2jwIC9Q33qWgnE=
+github.com/turbot/steampipe v1.7.0-rc.0.0.20230516153230-a938a696d29e h1:xHKqH1CueFpviC1SAeQhmfxS5e4Mfn/jp/b7QRRLZm4=
+github.com/turbot/steampipe v1.7.0-rc.0.0.20230516153230-a938a696d29e/go.mod h1:sDC02Vc5RYn/FqZ3vpuWlMqmawR7J2jwIC9Q33qWgnE=
 github.com/turbot/steampipe-plugin-sdk/v5 v5.4.1 h1:1d2Rt4SH9D/lnLhi7e7Zhv6d7OX8PzwKzCBbyvSeD+o=
 github.com/turbot/steampipe-plugin-sdk/v5 v5.4.1/go.mod h1:bfvdKaLwemr13EPOMbnr7/hOQOO7m4oM7HnVMdNotgY=
 github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=

hub/hub.go

@@ -287,7 +287,7 @@ func (h *Hub) GetIterator(columns []string, quals *proto.Quals, unhandledRestric
 	table := opts["table"]
 	log.Printf("[TRACE] Hub GetIterator() table '%s'", table)
 
-	if connectionName == constants.CommandSchema {
+	if connectionName == constants.InternalSchema {
 		return h.executeCommandScan(table)
 	}
 
@@ -848,7 +848,7 @@ func (h *Hub) ApplySetting(key string, value string) error {
 	return h.cacheSettings.Apply(key, value)
 }
 
-func (h *Hub) GetCommandSchema() map[string]*proto.TableSchema {
+func (h *Hub) GetSettingsSchema() map[string]*proto.TableSchema {
 	return map[string]*proto.TableSchema{
 		constants.CommandTableSettings: {
 			Columns: []*proto.ColumnDefinition{
@@ -896,7 +896,7 @@ func (h *Hub) executeCommandScan(table string) (Iterator, error) {
 		for i, m := range h.scanMetadata {
 			res.Rows[i] = m.AsResultRow()
 		}
-		return newInMemoryIterator(constants.CommandSchema, res), nil
+		return newInMemoryIterator(constants.InternalSchema, res), nil
 	default:
 		return nil, fmt.Errorf("cannot select from command table '%s'", table)
 	}

sql/sql.go

@@ -31,11 +31,11 @@ func GetSQLForTable(table string, tableSchema *proto.TableSchema, localSchema st
 		columnsString = append(columnsString, fmt.Sprintf("%s %s%s", column, t, trailing))
 	}
 
-	sql := fmt.Sprintf(`create foreign table %s.%s
+	sql := fmt.Sprintf(`CREATE FOREIGN TABLE IF NOT EXISTS %s.%s
 (
   %s
 )
-server %s OPTIONS (table %s)`,
+SERVER %s OPTIONS (table %s)`,
 		localSchema,
 		escapedTableName,
 		strings.Join(columnsString, "\n  "),