Merge pull request #10 from ConductorOne/mchavez-baton-vgs-v2

Fix capabilities

baton_capabilities.json

@@ -1,17 +1,54 @@
 {
-  "@type":  "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
-  "resourceTypeCapabilities":  [
+  "@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
+  "resourceTypeCapabilities": [
     {
-      "resourceType":  {
-        "id":  "user",
-        "displayName":  "User",
-        "traits":  [
+      "resourceType": {
+        "id": "org",
+        "displayName": "Org",
+        "annotations": [
+          {
+            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id": "org"
+          }
+        ]
+      },
+      "capabilities": [
+        "CAPABILITY_SYNC",
+        "CAPABILITY_PROVISION"
+      ]
+    },
+    {
+      "resourceType": {
+        "id": "user",
+        "displayName": "User",
+        "traits": [
           "TRAIT_USER"
+        ],
+        "annotations": [
+          {
+            "@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
+          }
         ]
       },
-      "capabilities":  [
+      "capabilities": [
         "CAPABILITY_SYNC"
       ]
+    },
+    {
+      "resourceType": {
+        "id": "vault",
+        "displayName": "Vault",
+        "annotations": [
+          {
+            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id": "vault"
+          }
+        ]
+      },
+      "capabilities": [
+        "CAPABILITY_SYNC",
+        "CAPABILITY_PROVISION"
+      ]
     }
   ]
 }

pkg/connector/connector.go

@@ -45,9 +45,15 @@ func (d *Connector) Validate(ctx context.Context) (annotations.Annotations, erro
 
 // New returns a new instance of the connector.
 func New(ctx context.Context, clientId, clientSecret, organizationId, vaultId string) (*Connector, error) {
-	vc, err := client.New(ctx, clientId, clientSecret, organizationId, vaultId)
-	if err != nil {
-		return nil, err
+	var (
+		vc  *client.VGSClient
+		err error
+	)
+	if clientId != "" && clientSecret != "" {
+		vc, err = client.New(ctx, clientId, clientSecret, organizationId, vaultId)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return &Connector{