Skip to content

Commit d0f06ff

Browse files
kanskans
authored
Merge pull request #17 from ConductorOne/kans/v4
v4
2 parents 700ebc2 + 82aba45 commit d0f06ff

File tree

140 files changed

+15296
-1994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+15296
-1994
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ jobs:
44
go-lint:
55
runs-on: ubuntu-latest
66
steps:
7+
- name: Checkout code
8+
uses: actions/checkout@v4
79
- name: Install Go
8-
uses: actions/setup-go@v4
10+
uses: actions/setup-go@v5
911
with:
10-
go-version: 1.22.x
11-
- name: Checkout code
12-
uses: actions/checkout@v3
12+
go-version-file: go.mod
1313
- name: Run linters
1414
uses: golangci/golangci-lint-action@v8
1515
with:
@@ -18,17 +18,17 @@ jobs:
1818
go-test:
1919
strategy:
2020
matrix:
21-
go-version: [1.22.x]
2221
platform: [ubuntu-latest]
2322
runs-on: ${{ matrix.platform }}
2423
steps:
24+
- name: Checkout code
25+
if: success()
26+
uses: actions/checkout@v4
2527
- name: Install Go
2628
if: success()
27-
uses: actions/setup-go@v4
29+
uses: actions/setup-go@v5
2830
with:
29-
go-version: ${{ matrix.go-version }}
30-
- name: Checkout code
31-
uses: actions/checkout@v3
31+
go-version-file: go.mod
3232
- name: go tests
3333
run: go test -v -covermode=count -json ./... > test.json
3434
- name: annotate go tests

‎.github/workflows/main.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,30 @@ jobs:
77
go-lint:
88
runs-on: ubuntu-latest
99
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
1012
- name: Install Go
11-
uses: actions/setup-go@v4
13+
uses: actions/setup-go@v5
1214
with:
13-
go-version: 1.22.x
14-
- name: Checkout code
15-
uses: actions/checkout@v3
15+
go-version-file: go.mod
1616
- name: Run linters
17-
uses: golangci/golangci-lint-action@v3
17+
uses: golangci/golangci-lint-action@v8
1818
with:
1919
version: latest
2020
args: --timeout=3m
2121
go-test:
2222
strategy:
2323
matrix:
24-
go-version: [ 1.22.x ]
2524
platform: [ ubuntu-latest ]
2625
runs-on: ${{ matrix.platform }}
2726
steps:
2827
- name: Install Go
2928
if: success()
30-
uses: actions/setup-go@v4
29+
uses: actions/setup-go@v5
3130
with:
32-
go-version: ${{ matrix.go-version }}
31+
go-version-file: go.mod
3332
- name: Checkout code
34-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3534
- name: go tests
3635
run: go test -v -covermode=count -json ./... > test.json
3736
- name: annotate go tests

‎.github/workflows/release.yaml‎

Lines changed: 13 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,18 @@ name: Release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
9-
goreleaser:
10-
runs-on: macos-latest
11-
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v2
14-
with:
15-
fetch-depth: 0
16-
- name: Set up Go
17-
uses: actions/setup-go@v4
18-
with:
19-
go-version: 1.22.x
20-
- name: Set up Gon
21-
run: brew tap conductorone/gon && brew install conductorone/gon/gon
22-
- name: Import Keychain Certs
23-
uses: apple-actions/import-codesign-certs@v1
24-
with:
25-
p12-file-base64: ${{ secrets.APPLE_SIGNING_KEY_P12 }}
26-
p12-password: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }}
27-
- name: Run GoReleaser
28-
uses: goreleaser/goreleaser-action@v6
29-
with:
30-
version: "~> v2"
31-
args: release --clean
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
34-
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
35-
AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
36-
goreleaser-docker:
37-
runs-on: ubuntu-latest
38-
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v2
41-
with:
42-
fetch-depth: 0
43-
- name: Set up Go
44-
uses: actions/setup-go@v4
45-
with:
46-
go-version: 1.22.x
47-
- name: Docker Login
48-
uses: docker/login-action@v1
49-
with:
50-
registry: ghcr.io
51-
username: ${{ github.repository_owner }}
52-
password: ${{ secrets.RELENG_GITHUB_TOKEN }}
53-
- name: Set up Docker Buildx
54-
uses: docker/setup-buildx-action@v1
55-
- name: Run GoReleaser
56-
uses: goreleaser/goreleaser-action@v6
57-
with:
58-
version: "~> v2"
59-
args: release --clean -f .goreleaser.docker.yaml
60-
env:
61-
GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
9+
release:
10+
uses: ConductorOne/github-workflows/.github/workflows/release.yaml@v2
11+
with:
12+
lambda: false
13+
tag: ${{ github.ref_name }}
14+
secrets:
15+
RELENG_GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
16+
APPLE_SIGNING_KEY_P12: ${{ secrets.APPLE_SIGNING_KEY_P12 }}
17+
APPLE_SIGNING_KEY_P12_PASSWORD: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }}
18+
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
19+
AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
20+
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}

‎go.mod‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/conductorone/baton-tableau
22

3-
go 1.24.2
3+
go 1.25
44

55
require (
6-
github.com/conductorone/baton-sdk v0.3.21
6+
github.com/conductorone/baton-sdk v0.4.2
77
github.com/ennyjfrick/ruleguard-logfatal v0.0.2
88
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
99
github.com/quasilyte/go-ruleguard/dsl v0.3.22
@@ -57,7 +57,7 @@ require (
5757
github.com/hashicorp/hcl v1.0.0 // indirect
5858
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5959
github.com/jellydator/ttlcache/v3 v3.3.0 // indirect
60-
github.com/klauspost/compress v1.17.11 // indirect
60+
github.com/klauspost/compress v1.18.0 // indirect
6161
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
6262
github.com/magiconair/properties v1.8.9 // indirect
6363
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -106,6 +106,7 @@ require (
106106
golang.org/x/oauth2 v0.26.0 // indirect
107107
golang.org/x/sync v0.11.0 // indirect
108108
golang.org/x/sys v0.30.0 // indirect
109+
golang.org/x/term v0.29.0 // indirect
109110
golang.org/x/text v0.22.0 // indirect
110111
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
111112
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
5858
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
5959
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6060
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
61-
github.com/conductorone/baton-sdk v0.3.21 h1:pYnOwkBc7xxrzvecwDcqaxsm3npPVE4xLs+8uQAKOWg=
62-
github.com/conductorone/baton-sdk v0.3.21/go.mod h1:lWZHgu025Rsgs5jvBrhilGti0zWF2+YfaFY/bWOS/g0=
61+
github.com/conductorone/baton-sdk v0.4.2 h1:hj/aXdaz850EVqnErw9DN/+3864LSdVcwa6p3vMrAfI=
62+
github.com/conductorone/baton-sdk v0.4.2/go.mod h1:Csa1C2KrI4TxJAtC3WjQqOn24u0g2f4/5FgiYqZWpN4=
6363
github.com/conductorone/dpop v0.2.3 h1:s91U3845GHQ6P6FWrdNr2SEOy1ES/jcFs1JtKSl2S+o=
6464
github.com/conductorone/dpop v0.2.3/go.mod h1:gyo8TtzB9SCFCsjsICH4IaLZ7y64CcrDXMOPBwfq/3s=
6565
github.com/conductorone/dpop/integrations/dpop_grpc v0.2.3 h1:kLMCNIh0Mo2vbvvkCmJ3ixsPbXEJ6HPcW53Ku9yje3s=
@@ -144,8 +144,8 @@ github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHT
144144
github.com/jellydator/ttlcache/v3 v3.3.0/go.mod h1:bj2/e0l4jRnQdrnSTaGTsh4GSXvMjQcy41i7th0GVGw=
145145
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
146146
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
147-
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
148-
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
147+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
148+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
149149
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
150150
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
151151
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

‎pkg/connector/user.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"github.com/conductorone/baton-tableau/pkg/tableau"
1414
)
1515

16+
var _ connectorbuilder.AccountManager = &userResourceType{}
17+
1618
type userResourceType struct {
1719
resourceType *v2.ResourceType
1820
client *tableau.Client
@@ -103,7 +105,7 @@ func (u *userResourceType) CreateAccountCapabilityDetails(ctx context.Context) (
103105
}, nil, nil
104106
}
105107

106-
func (o *userResourceType) CreateAccount(ctx context.Context, accountInfo *v2.AccountInfo, credentialOptions *v2.CredentialOptions) (
108+
func (o *userResourceType) CreateAccount(ctx context.Context, accountInfo *v2.AccountInfo, credentialOptions *v2.LocalCredentialOptions) (
107109
connectorbuilder.CreateAccountResponse,
108110
[]*v2.PlaintextData,
109111
annotations.Annotations,

‎vendor/github.com/conductorone/baton-sdk/internal/connector/connector.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_resource_tree.pb.go‎

Lines changed: 45 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)