Skip to content

Commit

Permalink
no-op refactors
Browse files Browse the repository at this point in the history
  • Loading branch information
@codingkarthik
codingkarthik committed Aug 1, 2024
1 parent d5111d7 commit a9c0d3a
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 40 deletions.
143 changes: 108 additions & 35 deletions registry-automation/cmd/ci.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@ type ChangedFiles struct {
type ConnectorVersion struct {
// Namespace of the connector, e.g. "hasura"
Namespace string `json:"namespace"`
// Name of the connector
// Name of the connector, e.g. "mongodb"
Name string `json:"name"`
// Semantic version of the connector
// Semantic version of the connector version, e.g. "v1.0.0"
Version string `json:"version"`
// Docker image of the connector version
// Docker image of the connector version (optional)
// This field is only required if the connector version is of type `PrebuiltDockerImage`
Image *string `json:"image,omitempty"`
// URL to the connector's metadata
PackageDefinitionURL string `json:"package_definition_url"`
// Is the connector version multitenant?
IsMultitenant bool `json:"is_multitenant"`
// Type of the connector packaing `PreBuiltDockerImage`/`ManagedDockerBuild`
// Type of the connector packaging `PreBuiltDockerImage`/`ManagedDockerBuild`
Type string `json:"type"`
}

Expand Down Expand Up @@ -187,43 +188,51 @@ func runCI(cmd *cobra.Command, args []string) {
// Collect the added or modified connectors
addedOrModifiedConnectorVersions := collectAddedOrModifiedConnectors(changedFiles)

var connectorVersions []ConnectorVersion
var uploadConnectorVersionErr error
encounteredError := false

for connectorName, versions := range addedOrModifiedConnectorVersions {
for version, connectorVersionPath := range versions {
var connectorVersion ConnectorVersion
connectorVersion, uploadConnectorVersionErr = uploadConnectorVersionPackage(client, connectorName, version, connectorVersionPath)
if err != nil {
fmt.Printf("Error while processing version and connector: %s - %s, Error: %v", version, connectorName, err)
encounteredError = true
// check if the map is empty
if len(addedOrModifiedConnectorVersions) == 0 {
fmt.Println("No connector versions found in the changed files.")
return
} else {
// Iterate over the added or modified connectors and upload the connector versions
var connectorVersions []ConnectorVersion
var uploadConnectorVersionErr error
encounteredError := false

for connectorName, versions := range addedOrModifiedConnectorVersions {
for version, connectorVersionPath := range versions {
var connectorVersion ConnectorVersion
connectorVersion, uploadConnectorVersionErr = uploadConnectorVersionPackage(client, connectorName, version, connectorVersionPath)

if uploadConnectorVersionErr != nil {
fmt.Printf("Error while processing version and connector: %s - %s, Error: %v", version, connectorName, err)
encounteredError = true
break
}
connectorVersions = append(connectorVersions, connectorVersion)
}
if encounteredError {
break
}
connectorVersions = append(connectorVersions, connectorVersion)
}
if encounteredError {
break
}
}

if encounteredError {
// attempt to cleanup the uploaded connector versions
_ = cleanupUploadedConnectorVersions(client, connectorVersions) // ignore errors while cleaning up
// delete the uploaded connector versions from the registry
log.Fatalf("Failed to upload the connector version: %v", uploadConnectorVersionErr)

} else {
fmt.Println("Successfully uploaded the connector versions to the registry")
err = updateRegistryGQL(connectorVersions)
if err != nil {
if encounteredError {
// attempt to cleanup the uploaded connector versions
_ = cleanupUploadedConnectorVersions(client, connectorVersions) // ignore errors while cleaning up
log.Fatalf("Failed to update the registry: %v", err)
// delete the uploaded connector versions from the registry
log.Fatalf("Failed to upload the connector version: %v", uploadConnectorVersionErr)

} else {
fmt.Printf("Connector versions to be added to the registry: %+v\n", connectorVersions)
err = updateRegistryGQL(connectorVersions)
if err != nil {
// attempt to cleanup the uploaded connector versions
_ = cleanupUploadedConnectorVersions(client, connectorVersions) // ignore errors while cleaning up
log.Fatalf("Failed to update the registry: %v", err)
}
}
}

fmt.Println("Successfully added connector versions to the registry.")
fmt.Println("Successfully added connector versions to the registry.")
}
}

func cleanupUploadedConnectorVersions(client *storage.Client, connectorVersions []ConnectorVersion) error {
Expand Down Expand Up @@ -319,7 +328,7 @@ func uploadConnectorVersionDefinition(client *storage.Client, connectorNamespace
// connector-definition.yaml present in the .hasura-connector folder.
func getConnectorVersionMetadata(err error, tgzUrl string, connectorName string, connectorVersion string) (map[string]interface{}, string, error) {
var connectorVersionMetadata map[string]interface{}
tgzPath := getTempFilePath("extracted_tgz", ".tgz")
tgzPath := getTempFilePath("extracted_tgz")

err = downloadFile(tgzUrl, tgzPath, map[string]string{})
if err != nil {
Expand Down Expand Up @@ -388,6 +397,48 @@ func getConnectorNamespace(connectorMetadata map[string]interface{}) (string, er
return connectorNamespace, nil
}

// struct to store the response of teh GetConnectorInfo query
type GetConnectorInfoResponse struct {
HubRegistryConnector []struct {
Name string `json:"name"`
MultitenantConnector *struct {
ID string `json:"id"`
} `json:"multitenant_connector"`
} `json:"hub_registry_connector"`
}

func getConnectorInfoFromRegistry(connectorNamespace string, connectorName string) (GetConnectorInfoResponse, error) {
var respData GetConnectorInfoResponse
client := graphql.NewClient(cmdArgs.ConnectorRegistryGQLUrl)
ctx := context.Background()

req := graphql.NewRequest(`
query GetConnectorInfo ($name: String!, $namespace: String!) {
hub_registry_connector(where: {_and: [{name: {_eq: $name}}, {namespace: {_eq: $namespace}}]}) {
name
multitenant_connector {
id
}
}
}`)
req.Var("name", connectorName)
req.Var("namespace", connectorNamespace)

req.Header.Set("x-hasura-role", "connector_publishing_automation")
req.Header.Set("x-connector-publication-key", cmdArgs.ConnectorPublicationKey)

// Execute the GraphQL query and check the response.
if err := client.Run(ctx, req, &respData); err != nil {
return respData, err
} else {
if len(respData.HubRegistryConnector) == 0 {
return respData, nil
}
}

return respData, nil
}

// buildRegistryPayload builds the payload for the registry upsert API
func buildRegistryPayload(
connectorNamespace string,
Expand All @@ -411,18 +462,40 @@ func buildRegistryPayload(
if !ok {
return connectorVersion, fmt.Errorf("could not find the 'dockerImage' of the PrebuiltDockerImage connector %s version %s in the connector's metadata", connectorName, version)
}

}

// TODO: Make a query to the registry to check if the connector already exists,
// if not, insert the connector first and then insert the connector version.
// Also, fetch the is_multitenant value from the registry.

// query GetConnectorInfo ($name: String!, $namespace: String!) {
// hub_registry_connector(where: {_and: [{name: {_eq: $name}}, {namespace: {_eq: $namespace}}]}) {
// name
// multitenant_connector {
// id
// }
// }
// }

connectorInfo, err := getConnectorInfoFromRegistry(connectorNamespace, connectorName)

if err != nil {
return connectorVersion, err
}

// Check if the connector exists in the registry first
if len(connectorInfo.HubRegistryConnector) == 0 {
return connectorVersion, fmt.Errorf("Inserting a new connector is not supported yet")
}

connectorVersion = ConnectorVersion{
Namespace: connectorNamespace,
Name: connectorName,
Version: version,
Image: &connectorVersionDockerImage,
PackageDefinitionURL: uploadedConnectorDefinitionTgzUrl,
IsMultitenant: false, // TODO(KC): Figure this out.
IsMultitenant: connectorInfo.HubRegistryConnector[0].MultitenantConnector != nil,
Type: connectorVersionPackagingType,
}

Expand Down
10 changes: 5 additions & 5 deletions registry-automation/cmd/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,24 @@ func readJSONFile[T any](location string) (T, error) {
const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"

// generateRandomFileName generates a random file name based on the current time.
func generateRandomFileName(fileExtension string) string {
func generateRandomFileName() string {
b := make([]byte, 10)
for i := range b {
b[i] = letterBytes[rand.Intn(len(letterBytes))]
}
return string(b) + fileExtension
return string(b) + ".tar.gz"
}

// getTempFilePath generates a random file name in the specified directory.
func getTempFilePath(directory string, fileExtension string) string {
func getTempFilePath(directory string) string {
// Ensure the directory exists
err := os.MkdirAll(directory, os.ModePerm)
if err != nil {
panic(fmt.Errorf("error creating directory: %v", err))
}

// Generate a random file name
fileName := generateRandomFileName(fileExtension)
fileName := generateRandomFileName()

// Create the file path
filePath := filepath.Join(directory, fileName)
Expand All @@ -100,7 +100,7 @@ func getTempFilePath(directory string, fileExtension string) string {
_, err = os.Stat(filePath)
if !os.IsNotExist(err) {
// File exists, generate a new name
fileName = generateRandomFileName(fileExtension)
fileName = generateRandomFileName()
filePath = filepath.Join(directory, fileName)
}
return filePath
Expand Down

0 comments on commit a9c0d3a

Please sign in to comment.