Skip to content

Commit 01d2c10

Browse files
authored
feat(jfrog-token): update module to accept username (#408)
1 parent 189636c commit 01d2c10

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

jfrog-token/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti
1515
```tf
1616
module "jfrog" {
1717
source = "registry.coder.com/modules/jfrog-token/coder"
18-
version = "1.0.19"
18+
version = "1.0.30"
1919
agent_id = coder_agent.example.id
2020
jfrog_url = "https://XXXX.jfrog.io"
2121
artifactory_access_token = var.artifactory_access_token
@@ -42,7 +42,7 @@ For detailed instructions, please see this [guide](https://coder.com/docs/v2/lat
4242
```tf
4343
module "jfrog" {
4444
source = "registry.coder.com/modules/jfrog-token/coder"
45-
version = "1.0.19"
45+
version = "1.0.30"
4646
agent_id = coder_agent.example.id
4747
jfrog_url = "https://YYYY.jfrog.io"
4848
artifactory_access_token = var.artifactory_access_token # An admin access token
@@ -75,7 +75,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio
7575
```tf
7676
module "jfrog" {
7777
source = "registry.coder.com/modules/jfrog-token/coder"
78-
version = "1.0.19"
78+
version = "1.0.30"
7979
agent_id = coder_agent.example.id
8080
jfrog_url = "https://XXXX.jfrog.io"
8181
artifactory_access_token = var.artifactory_access_token
@@ -95,7 +95,7 @@ data "coder_workspace" "me" {}
9595
9696
module "jfrog" {
9797
source = "registry.coder.com/modules/jfrog-token/coder"
98-
version = "1.0.19"
98+
version = "1.0.30"
9999
agent_id = coder_agent.example.id
100100
jfrog_url = "https://XXXX.jfrog.io"
101101
artifactory_access_token = var.artifactory_access_token

jfrog-token/main.test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ describe("jfrog-token", async () => {
2020
refreshable?: boolean;
2121
expires_in?: number;
2222
username_field?: string;
23+
username?: string;
2324
jfrog_server_id?: string;
2425
configure_code_server?: boolean;
2526
};

jfrog-token/main.tf

+8-2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ variable "username_field" {
6868
}
6969
}
7070

71+
variable "username" {
72+
type = string
73+
description = "Username to use for Artifactory. Overrides the field specified in `username_field`"
74+
default = null
75+
}
76+
7177
variable "agent_id" {
7278
type = string
7379
description = "The ID of a Coder agent."
@@ -99,8 +105,8 @@ variable "package_managers" {
99105
}
100106

101107
locals {
102-
# The username field to use for artifactory
103-
username = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
108+
# The username to use for artifactory
109+
username = coalesce(var.username, var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name)
104110
jfrog_host = split("://", var.jfrog_url)[1]
105111
common_values = {
106112
JFROG_URL = var.jfrog_url

0 commit comments

Comments
 (0)