Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,21 @@ steps:
- make lint

- name: Run tests
image: golang:1.20.8
image: golang:1.21.1
environment:
RUNNER_TEMP: /tmp
TELEPORT_ENTERPRISE_LICENSE:
from_secret: TELEPORT_ENTERPRISE_LICENSE
TERRAFORM_VERSION: 1.5.6-1
TELEPORT_VERSION: 13.3.8
TELEPORT_VERSION: 14.0.0
commands:
- echo Testing plugins against Teleport $TELEPORT_VERSION
- apt update && apt install -y gnupg software-properties-common
- curl -fsSL https://apt.releases.hashicorp.com/gpg | gpg --dearmor > /usr/share/keyrings/hashicorp-archive-keyring.gpg
- echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" > /etc/apt/sources.list.d/hashicorp.list

- curl -fsSL https://apt.releases.teleport.dev/gpg -o /usr/share/keyrings/teleport-archive-keyring.asc
- bash -c 'source /etc/os-release; echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] https://apt.releases.teleport.dev/$ID $VERSION_CODENAME stable/v13" | tee /etc/apt/sources.list.d/teleport.list > /dev/null'
- bash -c 'source /etc/os-release; echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] https://apt.releases.teleport.dev/$ID $VERSION_CODENAME stable/v14" | tee /etc/apt/sources.list.d/teleport.list > /dev/null'
- apt update && apt install -y terraform=$TERRAFORM_VERSION teleport-ent=$TELEPORT_VERSION
- make test

Expand Down Expand Up @@ -70,7 +71,7 @@ workspace:
steps:
- name: Install Go Toolchain
environment:
GO_VERSION: go1.20.8
GO_VERSION: go1.21.1
TOOLCHAIN_DIR: /tmp/teleport-plugins/${DRONE_BUILD_NUMBER}-${DRONE_BUILD_CREATED}/toolchains
TERRAFORM_VERSION: 1.5.6
TERRAFORM_ARCHIVE: terraform_1.5.6_darwin_amd64.zip
Expand All @@ -86,7 +87,7 @@ steps:

- name: Install Teleport
environment:
TELEPORT_VERSION: 13.3.8
TELEPORT_VERSION: 14.0.0
TOOLCHAIN_DIR: /tmp/teleport-plugins/${DRONE_BUILD_NUMBER}-${DRONE_BUILD_CREATED}/toolchains
commands:
- set -u
Expand Down Expand Up @@ -149,7 +150,7 @@ workspace:

steps:
- name: Build artifacts
image: golang:1.20.8
image: golang:1.21.1
commands:
- make build-all

Expand Down Expand Up @@ -185,7 +186,7 @@ workspace:
steps:
- name: Install Go Toolchain
environment:
GO_VERSION: go1.20.8
GO_VERSION: go1.21.1
TOOLCHAIN_DIR: /tmp/teleport-plugins/${DRONE_BUILD_NUMBER}-${DRONE_BUILD_CREATED}/toolchains
commands:
- set -u
Expand Down Expand Up @@ -241,7 +242,7 @@ workspace:

steps:
- name: Build artifacts
image: golang:1.20.8
image: golang:1.21.1
commands:
- mkdir -p build/
- export PLUGIN_TYPE=$(echo ${DRONE_TAG} | cut -d- -f2)
Expand Down Expand Up @@ -455,7 +456,7 @@ workspace:

steps:
- name: Build artifacts
image: golang:1.20.8
image: golang:1.21.1
commands:
- mkdir -p build/
- make release/terraform
Expand Down Expand Up @@ -528,7 +529,7 @@ trigger:
steps:
- name: Install Go Toolchain
environment:
GO_VERSION: go1.20.8
GO_VERSION: go1.21.1
TOOLCHAIN_DIR: /tmp/teleport-plugins/${DRONE_BUILD_NUMBER}-${DRONE_BUILD_CREATED}-${DRONE_STAGE_NAME}/toolchains
commands:
- set -u
Expand Down Expand Up @@ -617,7 +618,7 @@ workspace:

steps:
- name: Build artifacts
image: golang:1.20.8
image: golang:1.21.1
commands:
- mkdir -p build/
- make release/event-handler
Expand Down Expand Up @@ -765,7 +766,7 @@ trigger:
steps:
- name: Install Go Toolchain
environment:
GO_VERSION: go1.20.8
GO_VERSION: go1.21.1
TOOLCHAIN_DIR: /tmp/teleport-plugins/${DRONE_BUILD_NUMBER}-${DRONE_BUILD_CREATED}-${DRONE_STAGE_NAME}/toolchains
commands:
- set -u
Expand Down Expand Up @@ -1251,7 +1252,7 @@ concurrency:

steps:
- name: Upload terraform provider to staging registry
image: golang:1.20.8
image: golang:1.21.1
commands:
- cd tooling
- |
Expand Down Expand Up @@ -1309,7 +1310,7 @@ concurrency:

steps:
- name: Upload terraform provider to staging registry
image: golang:1.20.8
image: golang:1.21.1
commands:
- cd tooling
- |
Expand Down Expand Up @@ -1367,7 +1368,7 @@ concurrency:

steps:
- name: Promote terraform provider to public registry
image: golang:1.20.8
image: golang:1.21.1
commands:
- cd tooling
- |
Expand Down Expand Up @@ -1405,6 +1406,6 @@ steps:
from_secret: PRODUCTION_TERRAFORM_REGISTRY_SIGNING_KEY
---
kind: signature
hmac: c17310f28e521b2e143130a48fa7b820de102c97bc00564e46212a220e095f1c
hmac: 425a71127807e20a715648d0ab87f362c204dcc7dbc986771815dd3082697641

...
7 changes: 7 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v4
with:
cache: false
go-version-file: go.mod
if: ${{ matrix.language == 'go' }}

- name: Initialize the CodeQL tools for scanning
uses: github/codeql-action/init@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- name: Checkout Teleport Plugins
uses: actions/checkout@v3

- name: Setup Go 1.20.8
- name: Setup Go 1.21.1
uses: actions/setup-go@v3
with:
go-version: '1.20.8'
go-version: '1.21.1'

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/terraform-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: Checkout Teleport Plugins
uses: actions/checkout@v3

- name: Setup Go 1.20.8
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.20.8'
go-version: '1.21.1'

- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Install Teleport
uses: teleport-actions/setup@v1
with:
version: 13.3.8
version: 14.0.0
enterprise: true

- name: make test-terraform
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
- name: Checkout Teleport Plugins
uses: actions/checkout@v3

- name: Setup Go 1.20.8
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.20.8'
go-version: '1.21.1'

- name: Install Teleport
uses: teleport-actions/setup@v1
with:
version: 13.3.8
version: 14.0.0
enterprise: true

- name: Run unit tests
Expand All @@ -55,15 +55,15 @@ jobs:
- name: Checkout Teleport Plugins
uses: actions/checkout@v3

- name: Setup Go 1.20.8
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.20.8'
go-version: '1.21.1'

- name: Install Teleport
uses: teleport-actions/setup@v1
with:
version: 13.3.8
version: 14.0.0
enterprise: true

- name: Run unit tests
Expand Down
2 changes: 1 addition & 1 deletion access/discord/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-discord
Expand Down
2 changes: 1 addition & 1 deletion access/email/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-email
Expand Down
6 changes: 3 additions & 3 deletions access/email/email_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ func (s *EmailSuite) createAccessRequest(suggestedReviewers []string) types.Acce
t.Helper()

req := s.newAccessRequest(suggestedReviewers)
err := s.requestor().CreateAccessRequest(s.Context(), req)
out, err := s.requestor().CreateAccessRequestV2(s.Context(), req)
require.NoError(t, err)
return req
return out
}

func (s *EmailSuite) checkPluginData(reqID string, cond func(PluginData) bool) PluginData {
Expand Down Expand Up @@ -533,7 +533,7 @@ func (s *EmailSuite) TestRace() {
return setRaceErr(trace.Wrap(err))
}
req.SetSuggestedReviewers([]string{s.userNames.reviewer1, s.userNames.reviewer2})
if err := s.requestor().CreateAccessRequest(ctx, req); err != nil {
if _, err := s.requestor().CreateAccessRequestV2(ctx, req); err != nil {
return setRaceErr(trace.Wrap(err))
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion access/jira/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-jira
Expand Down
2 changes: 1 addition & 1 deletion access/mattermost/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-mattermost
Expand Down
2 changes: 1 addition & 1 deletion access/msteams/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-msteams
Expand Down
6 changes: 3 additions & 3 deletions access/msteams/ms_teams_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ func (s *TeamsSuite) createAccessRequest(reviewers []msapi.User) types.AccessReq
t.Helper()

req := s.newAccessRequest(reviewers)
err := s.requestor().CreateAccessRequest(s.Context(), req)
out, err := s.requestor().CreateAccessRequestV2(s.Context(), req)
require.NoError(t, err)
return req
return out
}

func (s *TeamsSuite) checkPluginData(reqID string, cond func(interface{}) bool) interface{} {
Expand Down Expand Up @@ -609,7 +609,7 @@ func (s *TeamsSuite) TestRace() {
return setRaceErr(trace.Wrap(err))
}
req.SetSuggestedReviewers([]string{reviewer1.Mail, reviewer2.Mail})
if err := s.requestor().CreateAccessRequest(ctx, req); err != nil {
if _, err := s.requestor().CreateAccessRequestV2(ctx, req); err != nil {
return setRaceErr(trace.Wrap(err))
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion access/pagerduty/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-pagerduty
Expand Down
2 changes: 1 addition & 1 deletion access/slack/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

BUILDDIR ?= build
BINARY = $(BUILDDIR)/teleport-slack
Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
# enterprise version, but has to be available on get.gravitational.com
RELEASE ?= teleport-ent-v6.0.2-linux-amd64-bin

RUNTIME ?= go1.20.8
RUNTIME ?= go1.21.1
BBOX ?= quay.io/gravitational/teleport-buildbox:$(RUNTIME)

# Teleport CLI and plugins CLI flags to pass to them on start
Expand Down
2 changes: 1 addition & 1 deletion event-handler/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=13.3.8
GO_VERSION=1.20.8
GO_VERSION=1.21.1

GITTAG=v$(VERSION)

Expand Down
Loading