VAULT-38191/use artifactory identity token in tests #34

kporter101 · 2025-07-30T22:07:59Z

How to read this pull request

VAULT-38191
Jfrog is no longer going to support username/ API key auth for Artifactory. Instead, an identity token (no username) will be used. Previous work has been done to support identity token auth in this repo (#31 & #22). This PR updates tests to use the identity token when there is no Artifactory user provided.

Note: The Artifactory identity token was added as ARTIFACTORY_BEARER_TOKEN in GH Actions secrets

Checklist

The commit message includes an explanation of the changes
Manual validation of the changes have been performed (if possible)
New or modified code has requisite test coverage (if possible)
I have performed a self-review of the changes
I have made necessary changes and/or pull requests for documentation
I have written useful comments in the code
Version file/release label updated, if release needed

ryancragun

Looking good so far!

ryancragun · 2025-08-01T20:06:30Z

internal/artifactory/aql_test.go

-		WithUsername(vars["username"]),
-		WithToken(vars["token"]),
-	)
+	if vars["username"] == "" {


You can probably simplify this a bit by creating a slice with the shared options, e.g.

opts := []Opt{ WithHost("https://artifactory.hashicorp.engineering/artifactory"), WithToken(vars["token"]), } if vars["username"] != "" { opts = append(opts, WithUsername(vars["username"])) } client = NewClient(opts...)

…no username

.github/workflows/test.yml

ryancragun

Lets clean up the docs and perhaps bump VERSION and this is g2g!

ryancragun · 2025-08-06T21:04:04Z

docs/resources/bundle_install.md


 - `artifactory` (Object, Sensitive) - `artifactory.username` (String) The Artifactory API username. This will likely be your hashicorp email address
 - `artifactory.token` (String) The Artifactory API token. You can sign into Artifactory and generate one
+- `artifactory.bearer_token` (String) The Artifactory Identity token - use instead of username/ API token. You can get a token by joining the


I don't think this is right? We reuse token here and don't have an attribute named bearer_token in the schema.

We'll want to remove to remove this change in resource_bundle_install and re-run the doc generator

I dropped the commit that had these changes

ryancragun · 2025-08-06T21:05:44Z

internal/plugin/datasource_artifactory_item_test.go

 // criteria.
 //
 //nolint:paralleltest// because our resource handles it
-func TestAccDataSourceArtifacotoryItemProperties(t *testing.T) {


Hey now, fixing typos that are like 4 years old.

ryancragun · 2025-08-06T21:08:58Z

internal/plugin/datasource_artifactory_item_test.go


 			cfg := template.Must(template.New("enos_data_artifactory_item").Parse(`data "enos_artifactory_item" "vault" {
+  {{if .Username.Value -}}
  username = "{{ .Username.Value }}"


Sorta surprised that this works. I would have expected us to require setting username to null when the value doesn't exist.

Ah, the datasource has the username marked as optional, as it should: https://github.com/hashicorp-forge/terraform-provider-enos/blob/main/internal/plugin/datasource_artifactory_item.go#L208

ryancragun · 2025-08-06T21:10:02Z

internal/plugin/resource_bundle_install.go

 					Description: docCaretToBacktick(`
 - ^artifactory.username^ (String) The Artifactory API username. This will likely be your hashicorp email address
 - ^artifactory.token^ (String) The Artifactory API token. You can sign into Artifactory and generate one
+- ^artifactory.bearer_token^ (String) The Artifactory Identity token - use instead of username/ API token. You can get a token by joining the


Yeah, we should yank this. We ended up reusing token to be either the API key or the bearer token and didn't add a new attribute.

…SourceArtifactoryItemProperties to handle token w no username

tvo0813 · 2025-08-06T21:45:13Z

.github/workflows/test.yml

      - run: make test-acc
        env:
          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}


are we using this anymore? or are we using both this and the bearer token?

right now we're supporting both auth options: username/token and just bearer token

Should we remove the user and token and just use the bearer token before merge? That way we can delete the secrets and move on with our life?

Good point! I removed them

kporter101 marked this pull request as ready for review July 31, 2025 18:29

kporter101 requested a review from ryancragun July 31, 2025 18:30

ryancragun reviewed Aug 1, 2025

View reviewed changes

kporter101 force-pushed the VAULT-38191/use-artifactory-token branch 2 times, most recently from 398aeaf to 3e45f5f Compare August 1, 2025 20:58

updated TestAccSearchAQL and TestAccSearchRawQuery to handle token w …

f9ae8cf

…no username

kporter101 force-pushed the VAULT-38191/use-artifactory-token branch 2 times, most recently from 62131fa to 6ce34cf Compare August 5, 2025 21:09

kporter101 commented Aug 5, 2025

View reviewed changes

.github/workflows/test.yml Show resolved Hide resolved

kporter101 force-pushed the VAULT-38191/use-artifactory-token branch 4 times, most recently from 70ec99d to 9ec16e9 Compare August 6, 2025 20:37

ryancragun reviewed Aug 6, 2025

View reviewed changes

kporter101 force-pushed the VAULT-38191/use-artifactory-token branch from 9ec16e9 to 7d21d06 Compare August 6, 2025 21:15

kporter101 added 7 commits August 6, 2025 17:21

updated TestAccDataSourceArtifactoryItemQueryTemplate and TestAccData…

bb3c0b9

…SourceArtifactoryItemProperties to handle token w no username

updated TestAccResourceBundleInstall to handle token w no username

df0a0e6

added bearer token to gh workflow

63fac7e

readme - fixed typos and added bearer token to example credentials

e3225a5

updated helper test skip msgs to show which vars are missing

f7ad6ed

fixed linting issues

836b173

added arch filter to go acc test target

c89fb3e

kporter101 force-pushed the VAULT-38191/use-artifactory-token branch from 7d21d06 to c89fb3e Compare August 6, 2025 21:21

tvo0813 reviewed Aug 6, 2025

View reviewed changes

bumped version

9d9cedf

kporter101 requested a review from ryancragun August 7, 2025 15:24

removed ARTIFACTORY_USER and TOKEN from github workflows test

05b469b

kporter101 merged commit c20c48e into main Aug 7, 2025
19 checks passed

kporter101 deleted the VAULT-38191/use-artifactory-token branch August 7, 2025 16:33

VAULT-38191/use artifactory identity token in tests #34

VAULT-38191/use artifactory identity token in tests #34

Uh oh!

Conversation

kporter101 commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to read this pull request

Checklist

Uh oh!

ryancragun left a comment

Choose a reason for hiding this comment

Uh oh!

ryancragun Aug 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ryancragun left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kporter101 commented Jul 30, 2025 •

edited

Loading

ryancragun Aug 1, 2025 •

edited

Loading