Skip to content

Commit fc77efa

Browse files
committed
adjust action parameters based on original tailscale/github-action
`oauth-client-secret` is renamed to `oauth-secret` to match the original action. Not all of the descriptions matched exactly, but this attempts to take the best from both versions. Default Tailscale version is updated to 1.88.3. Updates tailscale/corp#32814 Signed-off-by: Percy Wegmann <percy@tailscale.com>
1 parent 75aaac9 commit fc77efa

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

.github/workflows/speed-comparison.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
uses: ./
7272
with:
7373
oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
74-
oauth-client-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
74+
oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
7575
tags: "tag:ci"
7676
version: "1.82.0"
7777
use-cache: true

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
uses: ./
9797
with:
9898
oauth-client-id: ${{ secrets.TS_AUTH_KEYS_OAUTH_CLIENT_ID }}
99-
oauth-client-secret: ${{ secrets.TS_AUTH_KEYS_OAUTH_CLIENT_SECRET }}
99+
oauth-secret: ${{ secrets.TS_AUTH_KEYS_OAUTH_CLIENT_SECRET }}
100100
tags: "tag:ci"
101101
version: "${{ matrix.version }}"
102102
use-cache: false

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This action is written in Typescript using official GitHub SDKs. It provides som
4141
uses: jaxxstorm/action-setup-tailscale@v1
4242
with:
4343
oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
44-
oauth-client-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
44+
oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
4545
tags: "ci,github-actions"
4646
version: latest
4747
```
@@ -53,7 +53,7 @@ This action is written in Typescript using official GitHub SDKs. It provides som
5353
uses: jaxxstorm/action-setup-tailscale@v1
5454
with:
5555
oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
56-
oauth-client-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
56+
oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
5757
tags: "ci,github-actions,deploy"
5858
version: "1.82.0"
5959
hostname: "ci-${{ github.run_id }}"
@@ -69,7 +69,7 @@ This action is written in Typescript using official GitHub SDKs. It provides som
6969
|-------|-------------|----------|---------|
7070
| `authkey` | Tailscale authentication key | false | |
7171
| `oauth-client-id` | OAuth Client ID | false | |
72-
| `oauth-client-secret` | OAuth Client Secret | false | |
72+
| `oauth-secret` | OAuth Client Secret | false | |
7373
| `tags` | Comma-separated list of tags | false | |
7474
| `version` | Tailscale version to install | true | `1.82.0` |
7575
| `hostname` | Custom hostname | false | `github-<runner-name>` |
@@ -152,7 +152,7 @@ jobs:
152152
uses: jaxxstorm/action-setup-tailscale@v1
153153
with:
154154
oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
155-
oauth-client-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
155+
oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
156156
tags: "ci,deploy"
157157
use-cache: true
158158
@@ -180,7 +180,7 @@ jobs:
180180
uses: jaxxstorm/action-setup-tailscale@v1
181181
with:
182182
oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
183-
oauth-client-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
183+
oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
184184
tags: "ci,test"
185185
hostname: "test-${{ matrix.os }}-${{ github.run_id }}"
186186
use-cache: true

action.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ inputs:
1212
oauth-client-id:
1313
description: 'Your Tailscale OAuth Client ID.'
1414
required: false
15-
oauth-client-secret:
15+
oauth-secret:
1616
description: 'Your Tailscale OAuth Client Secret.'
1717
required: false
1818
tags:
19-
description: 'Comma separated list of tags to be applied to nodes (OAuth client must have permission to apply these tags).'
19+
description: 'Comma separated list of Tags to be applied to nodes. The OAuth client must have permission to apply these tags.'
2020
required: false
2121
version:
22-
description: 'Tailscale version to use. Specify `latest` for the latest stable version.'
22+
description: 'Tailscale version to use. Specify `latest` to use the latest stable version, and `unstable` to use the latest development version.'
2323
required: true
24+
default: '1.88.3'
2425
args:
2526
description: 'Optional additional arguments to `tailscale up`.'
2627
required: false
@@ -30,15 +31,15 @@ inputs:
3031
required: false
3132
default: ''
3233
hostname:
33-
description: 'Fixed hostname to use.'
34+
description: 'Fixed hostname to use. Must be a valid DNS label (alphanumeric and dashes only, 1-63 characters, cannot start or end with a dash). If not provided, a hostname will be generated based on the runner name.'
3435
required: false
3536
default: ''
3637
timeout:
3738
description: 'Timeout for `tailscale up`.'
3839
required: false
3940
default: '2m'
4041
retry:
41-
description: 'Number of retry attempts for Tailscale connection.'
42+
description: 'Number of retries for `tailscale up`.'
4243
required: false
4344
default: '5'
4445
use-cache:
@@ -50,7 +51,7 @@ inputs:
5051
required: false
5152
default: ''
5253
sha256sum:
53-
description: 'Expected SHA256 checksum of the Tailscale package. If not provided, it will be fetched automatically.'
54+
description: 'Expected SHA256 checksum of the tarball.'
5455
required: false
5556
default: ''
5657
ping:

dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41299,7 +41299,7 @@ async function getInputs() {
4129941299
arch: "",
4130041300
authKey: core.getInput("authkey") || "",
4130141301
oauthClientId: core.getInput("oauth-client-id") || "",
41302-
oauthSecret: core.getInput("oauth-client-secret") || "",
41302+
oauthSecret: core.getInput("oauth-secret") || "",
4130341303
tags: core.getInput("tags") || "",
4130441304
hostname: core.getInput("hostname") || "",
4130541305
args: core.getInput("args") || "",

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ async function getInputs(): Promise<TailscaleConfig> {
233233
arch: "",
234234
authKey: core.getInput("authkey") || "",
235235
oauthClientId: core.getInput("oauth-client-id") || "",
236-
oauthSecret: core.getInput("oauth-client-secret") || "",
236+
oauthSecret: core.getInput("oauth-secret") || "",
237237
tags: core.getInput("tags") || "",
238238
hostname: core.getInput("hostname") || "",
239239
args: core.getInput("args") || "",

0 commit comments

Comments
 (0)