Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support installing mods from GitLab repositories. Closes #656 #657

Merged
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
84 changes: 42 additions & 42 deletions .github/workflows/01-powerpipe-pre-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -330,56 +330,56 @@ jobs:
docker stop amazonlinux-2023-test
docker rm amazonlinux-2023-test

smoke_test_ubuntu_24_arm64:
name: Smoke test (Ubuntu 24, ARM64)
runs-on: ubuntu-latest
needs: [goreleaser]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Download Linux Build Artifact
uses: actions/download-artifact@v3
with:
name: build-artifact-linux-arm
path: ./artifacts
# smoke_test_ubuntu_24_arm64:
# name: Smoke test (Ubuntu 24, ARM64)
# runs-on: ubuntu-latest
# needs: [goreleaser]
# steps:
# - name: Checkout
# uses: actions/checkout@v4

# - name: Download Linux Build Artifact
# uses: actions/download-artifact@v3
# with:
# name: build-artifact-linux-arm
# path: ./artifacts

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3
# with:
# platforms: arm64

- name: Create Buildx Builder
run: |
docker buildx create --use --name mybuilder
docker buildx inspect --bootstrap
# - name: Create Buildx Builder
# run: |
# docker buildx create --use --name mybuilder
# docker buildx inspect --bootstrap

- name: Pull Ubuntu 24 ARM64 Image
run: docker pull arm64v8/ubuntu:latest
# - name: Pull Ubuntu 24 ARM64 Image
# run: docker pull arm64v8/ubuntu:latest

- name: Create and Start Ubuntu 24 ARM64 Container
run: |
docker run -d --name ubuntu-24-arm64-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts arm64v8/ubuntu:latest tail -f /dev/null
# - name: Create and Start Ubuntu 24 ARM64 Container
# run: |
# docker run -d --name ubuntu-24-arm64-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts arm64v8/ubuntu:latest tail -f /dev/null

- name: Get runner/container info
run: |
docker exec ubuntu-24-arm64-test /scripts/linux_container_info.sh
# - name: Get runner/container info
# run: |
# docker exec ubuntu-24-arm64-test /scripts/linux_container_info.sh

- name: Install dependencies, create user, and assign necessary permissions
run: |
docker exec ubuntu-24-arm64-test /scripts/prepare_ubuntu_container.sh
# - name: Install dependencies, create user, and assign necessary permissions
# run: |
# docker exec ubuntu-24-arm64-test /scripts/prepare_ubuntu_container.sh

- name: Run smoke tests
run: |
docker exec -u steampipe ubuntu-24-arm64-test /scripts/smoke_test.sh
# - name: Run smoke tests
# run: |
# docker exec -u steampipe ubuntu-24-arm64-test /scripts/smoke_test.sh

- name: Stop and Remove Container
run: |
docker stop ubuntu-24-arm64-test
docker rm ubuntu-24-arm64-test
# - name: Stop and Remove Container
# run: |
# docker stop ubuntu-24-arm64-test
# docker rm ubuntu-24-arm64-test

smoke_test_darwin_amd:
name: Smoke test (MacOS 13, x86_64)
Expand Down Expand Up @@ -421,7 +421,7 @@ jobs:

build_assets:
name: Build and Release Dashboard Assets
needs: [acceptance_test, smoke_test_ubuntu_24, smoke_test_centos_9, smoke_test_amazonlinux, smoke_test_ubuntu_24_arm64, smoke_test_darwin_amd]
needs: [acceptance_test, smoke_test_ubuntu_24, smoke_test_centos_9, smoke_test_amazonlinux, smoke_test_darwin_amd]
runs-on: ubuntu-latest
outputs:
version: ${{ steps.set_version.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/spf13/viper v1.19.0
github.com/stevenle/topsort v0.2.0 // indirect
github.com/turbot/go-kit v0.10.0-rc.0
github.com/turbot/pipe-fittings v1.6.6
github.com/turbot/pipe-fittings v1.6.7
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.0
github.com/turbot/terraform-components v0.0.0-20231213122222-1f3526cab7a7 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -818,8 +818,8 @@ github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQ
github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
github.com/turbot/go-kit v0.10.0-rc.0 h1:kd+jp2ibbIV33Hc8SsMAN410Dl9Pz6SJ40axbKUlSoA=
github.com/turbot/go-kit v0.10.0-rc.0/go.mod h1:fFQqR59I5z5JeeBLfK1PjSifn4Oprs3NiQx0CxeSJxs=
github.com/turbot/pipe-fittings v1.6.6 h1:MCSySiWFMYZlUEirA9D4frtnj0aOCfsNAwRip2jOJvY=
github.com/turbot/pipe-fittings v1.6.6/go.mod h1:1nlRVh18QkYy9eq5pW9gpnoE2VgnQW0Y2zKzrH8Q4kI=
github.com/turbot/pipe-fittings v1.6.7 h1:QRAdBlg+iVwenRFPwGo94nPQrHKFkdDu/TX5/kk+W7s=
github.com/turbot/pipe-fittings v1.6.7/go.mod h1:1nlRVh18QkYy9eq5pW9gpnoE2VgnQW0Y2zKzrH8Q4kI=
github.com/turbot/pipes-sdk-go v0.9.1 h1:2yRojY2wymvJn6NQyE6A0EDFV267MNe+yDLxPVvsBwM=
github.com/turbot/pipes-sdk-go v0.9.1/go.mod h1:Mb+KhvqqEdRbz/6TSZc2QWDrMa5BN3E4Xw+gPt2TRkc=
github.com/turbot/steampipe-plugin-code v0.7.0 h1:SROYIo/TI/Q/YNfXK+sAIS71umypUFm1Uz851TmoJkM=
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"major": 1,
"minor": 0,
"patch": 1
"patch": 2
}
9 changes: 9 additions & 0 deletions tests/acceptance/test_files/mod_install.bats
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@ top_level.benchmark.bm_version_dependency_mod_1,Benchmark version dependency mod
top_level.benchmark.bm_version_dependency_mod_2,Benchmark version dependency mod 2,,dependency_2.control.version,,,3.0,3.0,ok,'
}

@test "install mod from GitLab" {
run powerpipe mod install https://gitlab.com/puskar3/powerpipe-mod-test
assert_output --partial '
Installed 1 mod:

local
└── gitlab.com/puskar3/[email protected]'
}

function teardown() {
rm -rf .powerpipe/
rm -rf .mod.cache.json
Expand Down
Loading