[BB-1822] - Containerize Connector - MongoDB

.github/workflows/capabilities.yaml → .github/workflows/capabilities_and_config.yaml

@@ -28,7 +28,7 @@ jobs:
         run: ./connector config > config_schema.json
 
       - name: Run and save capabilities output
-        run: ./connector capabilities --public-key=test --private-key=test > baton_capabilities.json
+        run: ./connector capabilities --public-key="test-public-key" --private-key="test-private-key" > baton_capabilities.json
 
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
@@ -37,4 +37,4 @@ jobs:
           message: "Updating baton config schema and capabilities."
           add: |
             config_schema.json
-            baton_capabilities.json
+            baton_capabilities.json

.github/workflows/ci.yaml

@@ -1,5 +1,12 @@
 name: ci
-on: pull_request
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches:
+      - main
+
 jobs:
   go-lint:
     runs-on: ubuntu-latest
@@ -29,9 +36,9 @@ jobs:
         with:
           go-version-file: go.mod
       - name: go tests
-        run: go test -v -covermode=count -json ./... > test.json
+        run: (set -o pipefail && go test -v -covermode=count -json ./... | tee test.json)
       - name: annotate go tests
         if: always()
-        uses: guyarb/golang-test-annotations@v0.5.1
+        uses: guyarb/golang-test-annotations@v0.8.0
         with:
-          test-results: test.json
+          test-results: test.json

.github/workflows/release.yaml

@@ -4,7 +4,7 @@ name: Release
 on:
   push:
     tags:
-      - "*"
+      - '*'
 
 jobs:
   release:

Makefile

@@ -19,11 +19,11 @@ endif
 .PHONY: build
 build: $(GENERATED_CONF)
 	go build ${BUILD_TAGS} -o ${OUTPUT_PATH} ./cmd/baton-mongodb-atlas
-
+    
 $(GENERATED_CONF): pkg/config/config.go go.mod
 	@echo "Generating $(GENERATED_CONF)..."
 	go generate ./pkg/config
-
+    
 generate: $(GENERATED_CONF)
 
 .PHONY: update-deps
@@ -33,10 +33,10 @@ update-deps:
 	go mod vendor
 
 .PHONY: add-deps
-add-dep:
+add-deps:
 	go mod tidy -v
 	go mod vendor
-
+	
 .PHONY: lint
 lint:
 	golangci-lint run

baton_capabilities.json

@@ -1,129 +1,136 @@
 {
-  "@type":  "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
-  "resourceTypeCapabilities":  [
+  "@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
+  "resourceTypeCapabilities": [
     {
-      "resourceType":  {
-        "id":  "database",
-        "displayName":  "Database",
-        "traits":  [
+      "resourceType": {
+        "id": "database",
+        "displayName": "Database",
+        "traits": [
           "TRAIT_APP"
         ],
-        "description":  "MongoDB Database"
+        "description": "MongoDB Database"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "database_user",
-        "displayName":  "Database User",
-        "traits":  [
+      "resourceType": {
+        "id": "database_user",
+        "displayName": "Database User",
+        "traits": [
           "TRAIT_USER"
         ],
-        "annotations":  [
+        "annotations": [
           {
-            "@type":  "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
+            "@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
           }
         ],
-        "description":  "A MongoDB Atlas Database User"
+        "description": "A MongoDB Atlas Database User"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_RESOURCE_DELETE"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "mongo_cluster",
-        "displayName":  "Mongo Cluster",
-        "traits":  [
+      "resourceType": {
+        "id": "mongo_cluster",
+        "displayName": "Mongo Cluster",
+        "traits": [
           "TRAIT_APP"
         ],
-        "annotations":  [
+        "annotations": [
           {
-            "@type":  "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
+            "@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
           }
         ],
-        "description":  "A MongoDB Atlas Cluster"
+        "description": "A MongoDB Atlas Cluster"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "organization",
-        "displayName":  "Organization",
-        "description":  "A MongoDB Atlas Organization"
+      "resourceType": {
+        "id": "organization",
+        "displayName": "Organization",
+        "description": "A MongoDB Atlas Organization"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "project",
-        "displayName":  "Project",
-        "traits":  [
+      "resourceType": {
+        "id": "project",
+        "displayName": "Project",
+        "traits": [
           "TRAIT_GROUP"
         ],
-        "description":  "A MongoDB Atlas Project"
+        "description": "A MongoDB Atlas Project"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "team",
-        "displayName":  "Team",
-        "traits":  [
+      "resourceType": {
+        "id": "team",
+        "displayName": "Team",
+        "traits": [
           "TRAIT_GROUP"
         ],
-        "description":  "A MongoDB Atlas Team"
+        "description": "A MongoDB Atlas Team"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
-      ]
+      ],
+      "permissions": {}
     },
     {
-      "resourceType":  {
-        "id":  "user",
-        "displayName":  "User",
-        "traits":  [
+      "resourceType": {
+        "id": "user",
+        "displayName": "User",
+        "traits": [
           "TRAIT_USER"
         ],
-        "annotations":  [
+        "annotations": [
           {
-            "@type":  "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
+            "@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
           }
         ],
-        "description":  "A MongoDB Atlas Organization User"
+        "description": "A MongoDB Atlas Organization User"
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC",
         "CAPABILITY_ACCOUNT_PROVISIONING",
         "CAPABILITY_RESOURCE_DELETE"
-      ]
+      ],
+      "permissions": {}
     }
   ],
-  "connectorCapabilities":  [
+  "connectorCapabilities": [
     "CAPABILITY_PROVISION",
     "CAPABILITY_SYNC",
     "CAPABILITY_ACCOUNT_PROVISIONING",
     "CAPABILITY_RESOURCE_DELETE"
   ],
-  "credentialDetails":  {
-    "capabilityAccountProvisioning":  {
-      "supportedCredentialOptions":  [
+  "credentialDetails": {
+    "capabilityAccountProvisioning": {
+      "supportedCredentialOptions": [
         "CAPABILITY_DETAIL_CREDENTIAL_OPTION_RANDOM_PASSWORD"
       ],
-      "preferredCredentialOption":  "CAPABILITY_DETAIL_CREDENTIAL_OPTION_RANDOM_PASSWORD"
+      "preferredCredentialOption": "CAPABILITY_DETAIL_CREDENTIAL_OPTION_RANDOM_PASSWORD"
     }
   }
 }