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

azurerm_kubernetes_flux_configuration - added postBuild and wait properties to kustomization block #25695

Merged

Conversation

jayctran
Copy link
Contributor

@jayctran jayctran commented Apr 22, 2024

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Every time I tried to run the acceptance tests I hit this issue and couldn't get past it.
image
image

Got this working in the project I needed this for:
image

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #24081

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test failure:

------- Stdout: -------
=== RUN   TestAccKubernetesFluxConfiguration_kustomizationPostBuild
=== PAUSE TestAccKubernetesFluxConfiguration_kustomizationPostBuild
=== CONT  TestAccKubernetesFluxConfiguration_kustomizationPostBuild
    testcase.go:113: Step 1/2 error: Error running pre-apply refresh: exit status 1
        
        Error: Missing key/value separator
        
          on terraform_plugin_test.tf line 80, in resource "azurerm_kubernetes_flux_configuration" "test":
          75:     postBuild = {
          76:       substitute = {
          77:         "key" = "value",
          78:         "key2" = "value2"
          79:       }
          80:       substituteFrom {
        
        Expected an equals sign ("=") to mark the beginning of the attribute value.
    testing_new.go:79: Error retrieving state, there may be dangling resources: exit status 1
        
        Error: Missing key/value separator
        
          on terraform_plugin_test.tf line 80, in resource "azurerm_kubernetes_flux_configuration" "test":
          75:     postBuild = {
          76:       substitute = {
          77:         "key" = "value",
          78:         "key2" = "value2"
          79:       }
          80:       substituteFrom {
        
        Expected an equals sign ("=") to mark the beginning of the attribute value.
--- FAIL: TestAccKubernetesFluxConfiguration_kustomizationPostBuild (2.04s)
FAIL

@jayctran
Copy link
Contributor Author

Hi all, I've rebased main to resolve a merge conflict that it came up with, and also resolved make depscheck.

What I'm not sure of and would like some guidance around is how would you want the tests to be created when a client id, secret is required - as the run-gradually-deprecated checks are failing?

It's failing where os.GetEnv("ARM_CLIENT_ID") etc is utilised but is the expected way to do this to create a service principal with the azuread provider? In these particular tests they require a service principal which can be provided - or can already existing service principals be leveraged since the User Assigned Managed Identity does not have secrets that can be used?

Basically... What would be the best approach to leverage an application registration where I need to input the client id, tenant id and client secret as part of the resource test? As I'm only modifying these tests and didn't come up with them, I'd be happy with the easiest approach to resolving this.

@stephybun
Copy link
Member

Hey @jayctran,

The expectation is to create an application and service principal using the azuread provider. Here is a snippet of what that looks like for other tests that were previously using os.GetEnv("ARM_CLIENT_ID").

provider "azuread" {}
resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%[1]d"
location = "%[2]s"
}
resource "azuread_application" "test" {
display_name = "acctestspa-%[1]d"
}
resource "azuread_service_principal" "test" {
application_id = azuread_application.test.application_id
}
resource "azuread_service_principal_password" "test" {
service_principal_id = azuread_service_principal.test.object_id
}

@jayctran
Copy link
Contributor Author

Hey @jayctran,

The expectation is to create an application and service principal using the azuread provider. Here is a snippet of what that looks like for other tests that were previously using os.GetEnv("ARM_CLIENT_ID").

provider "azuread" {}
resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%[1]d"
location = "%[2]s"
}
resource "azuread_application" "test" {
display_name = "acctestspa-%[1]d"
}
resource "azuread_service_principal" "test" {
application_id = azuread_application.test.application_id
}
resource "azuread_service_principal_password" "test" {
service_principal_id = azuread_service_principal.test.object_id
}

Thanks @stephybun, that makes sense, I'll work on converting those older tests. Cheers

@jayctran jayctran force-pushed the kubernetesFluxConfiguration/postBuildAddition branch 3 times, most recently from 6359f86 to 0ec8499 Compare June 18, 2024 09:37
@jayctran jayctran requested a review from katbyte June 24, 2024 05:58
@jayctran jayctran force-pushed the kubernetesFluxConfiguration/postBuildAddition branch from 521b559 to fe64484 Compare July 11, 2024 12:39
@jayctran
Copy link
Contributor Author

Have just rebased this to get this up to date with main

@jayctran
Copy link
Contributor Author

hi @katbyte @stephybun , following up on whether the tests could be triggered again for this? The issues with the tests should be fixed now. Thanks

@jayctran jayctran force-pushed the kubernetesFluxConfiguration/postBuildAddition branch from fe64484 to 0677783 Compare July 30, 2024 13:34
@jayctran
Copy link
Contributor Author

Rebased to resolve merge conflicts

@jayctran
Copy link
Contributor Author

@katbyte bumping this

@jayctran jayctran force-pushed the kubernetesFluxConfiguration/postBuildAddition branch from 0677783 to 873ebc1 Compare September 26, 2024 17:23
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jayctran we had to revert something on main, could you perform a rebase? Once that's done I can approve and merge this 🙂

@jayctran jayctran force-pushed the kubernetesFluxConfiguration/postBuildAddition branch from eb76334 to e1667a7 Compare January 9, 2025 17:39
@jayctran
Copy link
Contributor Author

jayctran commented Jan 9, 2025

@jayctran we had to revert something on main, could you perform a rebase? Once that's done I can approve and merge this 🙂

Thanks @stephybun. No problem, that's been rebased and branch updated. Cheers!

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jayctran LGTM 💯

@stephybun stephybun merged commit 38cba6f into hashicorp:main Jan 10, 2025
33 checks passed
@github-actions github-actions bot added this to the v4.15.0 milestone Jan 10, 2025
stephybun added a commit that referenced this pull request Jan 10, 2025
jackofallops pushed a commit that referenced this pull request Jan 10, 2025
jackofallops added a commit that referenced this pull request Jan 10, 2025
* Update CHANGELOG.md for #28233

* Update for #28215

* Update CHANGELOG.md for #28279

* Update CHANGELOG.md #28269

* Update CHANGELOG.md #27876

* Update CHANGELOG.md #28069

* Update CHANGELOG.md for #28312

* Update CHANGELOG.md for #28278

* Update CHANGELOG.md #28311

* Update CHANGELOG.md undo 28311

* Update CHANGELOG.md #27874

* Update CHANGELOG.md

* Update CHANGELOG for #28352

* Update CHANGELOG.md for #28390

* Update CHANGELOG.md for #28398

* Update CHANGELOG.md for #28425

* Update CHANGELOG.md #28427

* Update CHANGELOG.md #28280

* Update CHANGELOG.md for #28319

* Update CHANGELOG.md #24801

* Update for #28360 #28216 #27830 #28404 #27401 #27122 #27931 #28442

* Update for #28379

* Update CHANGELOG.md for #28281

* Update for #28380

* Update for #27375

* Update for #25695

* Update CHANGELOG.md #27985

* Update CHANGELOG.md - update release date manually until can be scripted

* Update CHANGELOG.md revert date change as script available

* pre-release script updates

---------

Co-authored-by: stephybun <[email protected]>
Co-authored-by: catriona-m <[email protected]>
Co-authored-by: Wyatt Fry <[email protected]>
Co-authored-by: sreallymatt <[email protected]>
Co-authored-by: Matthew Frahry <[email protected]>
Co-authored-by: kt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for postBuild substitution in flux_configuration
6 participants