Skip to content

Commit 5d8f7d3

Browse files
committed
Merge branch 'business_plus_and_actions_fix' of github.com:ConductorOne/baton-slack into business_plus_and_actions_fix
2 parents 4c737f2 + fc9aac2 commit 5d8f7d3

File tree

4 files changed

+51
-48
lines changed

4 files changed

+51
-48
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353
uses: ConductorOne/github-workflows/actions/sync-test@v2
5454
with:
5555
connector: ./baton-slack
56-
baton-entitlement: 'usergroup:S080HE5AEJK:member'
57-
baton-principal: 'U080HD5HKE3'
56+
baton-entitlement: 'group:S0A1RHL4CP5:member'
57+
baton-principal: 'U0847EPUZ0R'
5858
baton-principal-type: 'user'

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
uses: ConductorOne/github-workflows/.github/workflows/release.yaml@v2
1111
with:
1212
tag: ${{ github.ref_name }}
13-
lambda: false
13+
lambda: true
1414
secrets:
1515
RELENG_GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
1616
APPLE_SIGNING_KEY_P12: ${{ secrets.APPLE_SIGNING_KEY_P12 }}

Dockerfile.lambda

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM public.ecr.aws/lambda/provided:al2023
2+
ENTRYPOINT ["/baton-slack", "lambda"]
3+
COPY baton-slack /

baton_capabilities.json

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,107 @@
11
{
2-
"@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
3-
"resourceTypeCapabilities": [
2+
"@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
3+
"resourceTypeCapabilities": [
44
{
5-
"resourceType": {
6-
"id": "enterpriseRole",
7-
"displayName": "Enterprise Role",
8-
"traits": [
5+
"resourceType": {
6+
"id": "enterpriseRole",
7+
"displayName": "Enterprise Role",
8+
"traits": [
99
"TRAIT_ROLE"
1010
]
1111
},
12-
"capabilities": [
12+
"capabilities": [
1313
"CAPABILITY_SYNC",
1414
"CAPABILITY_PROVISION"
1515
],
16-
"permissions": {}
16+
"permissions": {}
1717
},
1818
{
19-
"resourceType": {
20-
"id": "group",
21-
"displayName": "IDP Group",
22-
"traits": [
19+
"resourceType": {
20+
"id": "group",
21+
"displayName": "IDP Group",
22+
"traits": [
2323
"TRAIT_GROUP"
2424
]
2525
},
26-
"capabilities": [
26+
"capabilities": [
2727
"CAPABILITY_SYNC",
2828
"CAPABILITY_PROVISION"
2929
],
30-
"permissions": {}
30+
"permissions": {}
3131
},
3232
{
33-
"resourceType": {
34-
"id": "user",
35-
"displayName": "User",
36-
"traits": [
33+
"resourceType": {
34+
"id": "user",
35+
"displayName": "User",
36+
"traits": [
3737
"TRAIT_USER"
3838
],
39-
"annotations": [
39+
"annotations": [
4040
{
41-
"@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
41+
"@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
4242
}
4343
]
4444
},
45-
"capabilities": [
45+
"capabilities": [
4646
"CAPABILITY_SYNC",
4747
"CAPABILITY_ACCOUNT_PROVISIONING"
4848
],
49-
"permissions": {}
49+
"permissions": {}
5050
},
5151
{
52-
"resourceType": {
53-
"id": "userGroup",
54-
"displayName": "User Group",
55-
"traits": [
52+
"resourceType": {
53+
"id": "userGroup",
54+
"displayName": "User Group",
55+
"traits": [
5656
"TRAIT_GROUP"
5757
]
5858
},
59-
"capabilities": [
59+
"capabilities": [
6060
"CAPABILITY_SYNC"
6161
],
62-
"permissions": {}
62+
"permissions": {}
6363
},
6464
{
65-
"resourceType": {
66-
"id": "workspace",
67-
"displayName": "Workspace",
68-
"traits": [
65+
"resourceType": {
66+
"id": "workspace",
67+
"displayName": "Workspace",
68+
"traits": [
6969
"TRAIT_GROUP"
7070
]
7171
},
72-
"capabilities": [
72+
"capabilities": [
7373
"CAPABILITY_SYNC",
7474
"CAPABILITY_PROVISION"
7575
],
76-
"permissions": {}
76+
"permissions": {}
7777
},
7878
{
79-
"resourceType": {
80-
"id": "workspaceRole",
81-
"displayName": "Workspace Role",
82-
"traits": [
79+
"resourceType": {
80+
"id": "workspaceRole",
81+
"displayName": "Workspace Role",
82+
"traits": [
8383
"TRAIT_ROLE"
8484
]
8585
},
86-
"capabilities": [
86+
"capabilities": [
8787
"CAPABILITY_SYNC",
8888
"CAPABILITY_PROVISION"
8989
],
90-
"permissions": {}
90+
"permissions": {}
9191
}
9292
],
93-
"connectorCapabilities": [
93+
"connectorCapabilities": [
9494
"CAPABILITY_PROVISION",
9595
"CAPABILITY_SYNC",
9696
"CAPABILITY_ACCOUNT_PROVISIONING",
9797
"CAPABILITY_ACTIONS"
9898
],
99-
"credentialDetails": {
100-
"capabilityAccountProvisioning": {
101-
"supportedCredentialOptions": [
99+
"credentialDetails": {
100+
"capabilityAccountProvisioning": {
101+
"supportedCredentialOptions": [
102102
"CAPABILITY_DETAIL_CREDENTIAL_OPTION_NO_PASSWORD"
103103
],
104-
"preferredCredentialOption": "CAPABILITY_DETAIL_CREDENTIAL_OPTION_NO_PASSWORD"
104+
"preferredCredentialOption": "CAPABILITY_DETAIL_CREDENTIAL_OPTION_NO_PASSWORD"
105105
}
106106
}
107107
}

0 commit comments

Comments
 (0)