Skip to content

Commit 8d14c9a

Browse files
Point at akamai-apis repo; remove legacy spec resolution logic
1 parent dddc940 commit 8d14c9a

File tree

11 files changed

+8
-141
lines changed

11 files changed

+8
-141
lines changed

.github/workflows/docker-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717
- name: Build the Docker image
18-
run: docker build . --file Dockerfile --tag linode/cli:$(date +%s) --build-arg="github_token=$GITHUB_TOKEN"
19-
env:
20-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
run: docker build . --file Dockerfile --tag linode/cli:$(date +%s)

.github/workflows/e2e-suite-windows.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ jobs:
6969

7070
- name: Install the CLI
7171
run: make install
72-
env:
73-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7472

7573
- run: make INTEGRATION_TEST_PATH="${{ inputs.test_path }}" testint
7674
env:
@@ -102,4 +100,4 @@ jobs:
102100
status: 'completed',
103101
conclusion: process.env.conclusion
104102
});
105-
return result;
103+
return result;

.github/workflows/e2e-suite.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101
102102
- name: Install Package
103103
run: make install
104-
env:
105-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106104

107105
- name: Set LINODE_CLI_TOKEN
108106
run: |

.github/workflows/nightly-smoke-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ jobs:
3434

3535
- name: Install Linode CLI
3636
run: make install
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3937

4038
- name: Run smoke tests
4139
id: smoke_tests

.github/workflows/publish-oci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ jobs:
5757
tags: linode/cli:${{ steps.cli_version.outputs.result }},linode/cli:latest
5858
build-args: |
5959
linode_cli_version=${{ steps.cli_version.outputs.result }}
60-
github_token=${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-pypi.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
- name: Build the package
3131
run: make build
3232
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3433
LINODE_CLI_VERSION: ${{ github.event.release.tag_name }}
3534

3635
- name: Publish the release artifacts to PyPI

.github/workflows/remote-release-trigger.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

.github/workflows/unit-tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929

3030
- name: Install Package
3131
run: make install
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3432

3533
- name: Run the unit test suite
3634
run: make test
@@ -59,8 +57,6 @@ jobs:
5957
shell: pwsh
6058
run: |
6159
make install
62-
env:
63-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6460
6561
- name: Run the unit test suite
6662
run: make test

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM python:3.11-slim AS builder
22

33
ARG linode_cli_version
44

5-
ARG github_token
6-
75
WORKDIR /src
86

97
RUN apt-get update && \
@@ -13,7 +11,7 @@ COPY . .
1311

1412
RUN make requirements
1513

16-
RUN LINODE_CLI_VERSION=$linode_cli_version GITHUB_TOKEN=$github_token make build
14+
RUN LINODE_CLI_VERSION=$linode_cli_version make build
1715

1816
FROM python:3.11-slim
1917

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
# Makefile for more convenient building of the Linode CLI and its baked content
33
#
44

5+
# The URL of the raw OpenAPI spec to build linode-cli with.
6+
# TODO: Uncomment once spec is available in the akamai-apis repository.
7+
# SPEC := https://raw.githubusercontent.com/akamai/akamai-apis/main/apis/linode-api/v4/openapi.json
8+
SPEC := https://raw.githubusercontent.com/linode/linode-api-docs/development/openapi.yaml
9+
510
# Test-related arguments
611
MODULE :=
712
TEST_CASE_COMMAND :=
@@ -11,11 +16,6 @@ ifdef TEST_CASE
1116
TEST_CASE_COMMAND = -k $(TEST_CASE)
1217
endif
1318

14-
SPEC_VERSION ?= latest
15-
ifndef SPEC
16-
override SPEC = $(shell ./resolve_spec_url ${SPEC_VERSION})
17-
endif
18-
1919
# Version-related variables
2020
VERSION_FILE := ./linodecli/version.py
2121
VERSION_MODULE_DOCSTRING ?= \"\"\"\nThe version of the Linode CLI.\n\"\"\"\n\n

0 commit comments

Comments
 (0)