Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Replace slack and supporting libs with teleport dependencies #793

Merged
justinas merged 13 commits into from
Apr 4, 2023
Merged

Replace slack and supporting libs with teleport dependencies #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0c8f993
Remove code that has been vendored in teleport
Mar 23, 2023
65fcf2f
Replace import paths
Mar 23, 2023
26c4402
Update teleport, teleport/api imports
Mar 23, 2023
6c5c4e2
Stop referencing removed paths in Dockerfiles
Mar 23, 2023
4e634ca
Bump teleport ref
Mar 23, 2023
df110ed
Remove obsolete test-lib target
Mar 23, 2023
c10647c
Run GCI
Mar 23, 2023
774c041
Try to set teleport pseudo-version to v0 to placate dependency review
Mar 23, 2023
3bd659e
Try to ignore dependency review false-positive
Mar 23, 2023
3bed1a5
Merge remote-tracking branch 'origin/master' into justinas/teleport-v…
Mar 29, 2023
bb623ee
Add a script to update teleport dependency version
Mar 29, 2023
b13a013
Bump teleport ref to branch/v12
Mar 29, 2023
03a0f8d
Merge branch 'master' into justinas/teleport-vendored-plugins
justinas Apr 4, 2023
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
3 changes: 3 additions & 0 deletions .github/workflows/dependency-review.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ jobs:
uses: gravitational/shared-workflows/.github/workflows/dependency-review.yaml@main
permissions:
contents: read
with:
# gravitational/teleport misdetected as "v0"
allow-ghsas: GHSA-6xf3-5hp7-xqqg
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,7 @@ test-tooling:
(cd tooling; go test -v -race ./...)

.PHONY: test-unit
test-unit: test-tooling test-lib test-access test-event-handler

.PHONY: test-lib
test-lib:
(cd lib; go test -v -race ./...)
test-unit: test-tooling test-access test-event-handler

.PHONY: test-access
test-access:
Expand Down Expand Up @@ -224,6 +220,11 @@ update-helm-version-%:
# Update snapshots
@helm unittest -u -3 charts/$(subst access-,access/,$*) || { echo "Please install unittest as described in .cloudbuild/helm-unittest.yaml" ; exit 1; }

TELEPORT_DEP_VERSION ?= v12.1.1
.PHONY: update-teleport-dep-version
update-teleport-dep-version:
./update_teleport_dep_version.sh $(TELEPORT_DEP_VERSION)

.PHONY: update-tag
update-tag:
# Make sure VERSION is set on the command line "make update-tag VERSION=x.y.z".
Expand Down
4 changes: 1 addition & 3 deletions access/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download

# Copy the go source
COPY access/${ACCESS_PLUGIN} access/${ACCESS_PLUGIN}
COPY access/common access/common
COPY lib lib

# Build
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make -C access/${ACCESS_PLUGIN} GITREF=${GITREF}
Expand All @@ -28,4 +26,4 @@ FROM gcr.io/distroless/base@sha256:03dcbf61f859d0ae4c69c6242c9e5c3d7e1a42e5d3b69
ARG ACCESS_PLUGIN
COPY --from=builder /workspace/access/${ACCESS_PLUGIN}/build/teleport-${ACCESS_PLUGIN} /usr/local/bin/teleport-plugin

ENTRYPOINT ["/usr/local/bin/teleport-plugin"]
ENTRYPOINT ["/usr/local/bin/teleport-plugin"]
Loading