fix conflicts

Author: aldevv

baton_capabilities.json

@@ -1,79 +1,98 @@
 {
-  "@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
-  "resourceTypeCapabilities": [
+  "@type":  "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
+  "resourceTypeCapabilities":  [
     {
-      "resourceType": {
-        "id": "org",
-        "displayName": "Org",
-        "annotations": [
+      "resourceType":  {
+        "id":  "org",
+        "displayName":  "Org",
+        "annotations":  [
           {
-            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
-            "id": "org"
+            "@type":  "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id":  "org"
           }
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "repository",
-        "displayName": "Repository",
-        "annotations": [
+      "resourceType":  {
+        "id":  "org_role",
+        "displayName":  "Organization Role",
+        "traits":  [
+          "TRAIT_ROLE"
+        ],
+        "annotations":  [
+          {
+            "@type":  "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id":  "org_role"
+          }
+        ]
+      },
+      "capabilities":  [
+        "CAPABILITY_SYNC",
+        "CAPABILITY_PROVISION"
+      ]
+    },
+    {
+      "resourceType":  {
+        "id":  "repository",
+        "displayName":  "Repository",
+        "annotations":  [
           {
-            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
-            "id": "repository"
+            "@type":  "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id":  "repository"
           }
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "team",
-        "displayName": "Team",
-        "traits": [
+      "resourceType":  {
+        "id":  "team",
+        "displayName":  "Team",
+        "traits":  [
           "TRAIT_GROUP"
         ],
-        "annotations": [
+        "annotations":  [
           {
-            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
-            "id": "team"
+            "@type":  "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id":  "team"
           }
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "user",
-        "displayName": "User",
-        "traits": [
+      "resourceType":  {
+        "id":  "user",
+        "displayName":  "User",
+        "traits":  [
           "TRAIT_USER"
         ],
-        "annotations": [
+        "annotations":  [
           {
-            "@type": "type.googleapis.com/c1.connector.v2.V1Identifier",
-            "id": "user"
+            "@type":  "type.googleapis.com/c1.connector.v2.V1Identifier",
+            "id":  "user"
           }
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC"
       ]
     }
   ],
-  "connectorCapabilities": [
+  "connectorCapabilities":  [
     "CAPABILITY_PROVISION",
     "CAPABILITY_SYNC"
   ],
-  "credentialDetails": {}
+  "credentialDetails":  {}
 }

pkg/connector/connector.go

@@ -55,6 +55,12 @@ var (
 		Traits:      []v2.ResourceType_Trait{v2.ResourceType_TRAIT_SECRET},
 		Annotations: annotations.New(&v2.SkipEntitlementsAndGrants{}),
 	}
+	resourceTypeOrgRole = &v2.ResourceType{
+		Id:          "org_role",
+		DisplayName: "Organization Role",
+		Traits:      []v2.ResourceType_Trait{v2.ResourceType_TRAIT_ROLE},
+		Annotations: v1AnnotationsForResourceType("org_role"),
+	}
 )
 
 type GitHub struct {
@@ -73,6 +79,7 @@ func (gh *GitHub) ResourceSyncers(ctx context.Context) []connectorbuilder.Resour
 		teamBuilder(gh.client, gh.orgCache),
 		userBuilder(gh.client, gh.hasSAMLEnabled, gh.graphqlClient, gh.orgCache),
 		repositoryBuilder(gh.client, gh.orgCache),
+		orgRoleBuilder(gh.client, gh.orgCache),
 	}
 
 	if gh.syncSecrets {

pkg/connector/org.go

@@ -50,6 +50,7 @@ func organizationResource(
 		&v2.ChildResourceType{ResourceTypeId: resourceTypeUser.Id},
 		&v2.ChildResourceType{ResourceTypeId: resourceTypeTeam.Id},
 		&v2.ChildResourceType{ResourceTypeId: resourceTypeRepository.Id},
+		&v2.ChildResourceType{ResourceTypeId: resourceTypeOrgRole.Id},
 	}
 	if syncSecrets {
 		annotations = append(annotations, &v2.ChildResourceType{ResourceTypeId: resourceTypeApiToken.Id})