Third times a charm for protected environments #938

Shocktrooper · 2022-03-08T08:30:37Z

Continuation of #750 on a new fork

github-actions

It looks like this is your first submission to the Terraform GitLab Provider! If you haven’t already done so, please make sure you have checked out our CONTRIBUTING.md guide to make sure your contribution has all the necessary elements in place for a successful approval.

Thanks again, and welcome to the community! 😃

Shocktrooper · 2022-03-08T08:31:35Z

@timofurrer here is the new PR on my fork. I left a comment in one of the files and not sure I put the right value. Other than that I am not sure if I modified the other files correctly to conform to the changes the provider went through

Shocktrooper · 2022-03-09T17:22:13Z

@timofurrer I have some unit tests failing and not sure why. If you have some free time to sync up I would like to try and figure out why they are failing. Go is not my strong suit

timofurrer

Thanks for taking that up! There are a few things which need to be addressed.

Also the examples are missing (see the examples/ folder).

internal/provider/resource_gitlab_project_environment.go

internal/provider/resource_gitlab_project_protected_environment.go

github-actions · 2022-03-11T00:35:48Z

This pull request has merge conflicts. Please rebase your branch onto main.

github-actions · 2022-03-11T00:40:15Z

Conflicts are resolved. Thank you! 😀

internal/provider/resource_gitlab_project_environment.go

internal/provider/resource_gitlab_project_protected_environment.go

internal/provider/resource_gitlab_project_environment.go

internal/provider/resource_gitlab_project_protected_environment.go

internal/provider/resource_gitlab_project_environment.go

internal/provider/resource_gitlab_project_protected_environment_test.go

Required by: * gitlabhq/terraform-provider-gitlab#938

Shocktrooper · 2022-03-16T21:21:10Z

@armsnyder @timofurrer Not sure if there is a way to mark me permanently as a trusted contributor for this PR but for protected environments I do not have an EE license to test with and I have to do the functional tests for them. If you have a temp license or another way to do the tests I am all ears

timofurrer · 2022-03-16T21:24:51Z

@Shocktrooper Unfortunately, we can't I'm afraid - Good news though is that you can obtain a free Ultimate license as a trial, from here: https://about.gitlab.com/free-trial/.

Shocktrooper · 2022-03-16T21:28:05Z

@timofurrer Perfect ty!

internal/provider/resource_gitlab_project_environment.go

internal/provider/resource_gitlab_project_environment_test.go

Shocktrooper · 2022-03-20T09:16:55Z

@timofurrer I am also completely re-hauling the protected environments acceptance tests based on review comments on the project environments resource and other things. I should have it done later today

timofurrer · 2022-03-20T09:29:08Z

@Shocktrooper sounds good! I've assigned it to the next release, which I plan to release shortly after GitLab 14.9 is out :)

I'm going to review it in the evening :)

Just re-request the review once you are done 🎉

Shocktrooper · 2022-03-20T09:35:36Z

@timofurrer Will do! Also want to get these 2 fields you added in assuming the go-gitlab work is done and released before 14.9? https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82980

timofurrer · 2022-03-20T09:42:21Z

These two fields are already present in the responses of 14.8 - but just weren't documented. However, they are not yet in go-gitlab and I don't think they are of particular interest - at least not in this first iteration of these resources.

I'd ignore them for now :)

Shocktrooper · 2022-03-20T10:22:01Z

@timofurrer Sounds good! Also I have to go back to bed but I believe the acceptance tests are close to a done state pending any failures if you want to take a cursory check. I'll fix any review comments/failures in ~5 hours when I wake up.

timofurrer · 2022-03-20T15:25:22Z

@Shocktrooper I'm actually working on a few shortcomings and fixing the tests. I'll keep you posted :)

timofurrer · 2022-03-20T15:55:34Z

Alright @Shocktrooper I did couple of things here:

rebased to the latest main - make sure to pull it first if you want to change anything!
cleaned up Git history
fixed a couple of bugs (see my additional commit)
fixed the testing (see my additional commit)
adjusted the docs slightly

The tests should now pass and as far as I can tell the resource work fine :)

I'd say this is ready for a merge. Because I've changed quite some stuff I'd be happy if @armsnyder you can review :)

timofurrer

LGTM 🎉

@armsnyder WDYT ? 🏓

Shocktrooper · 2022-03-20T16:24:22Z

@timofurrer Want to resolve all of the pending threads as well?

timofurrer · 2022-03-20T16:27:58Z

@Shocktrooper Yes, absolutely - I thought I did but obviously wasn't the case 🤦

… resources

github-actions · 2022-03-30T14:11:22Z

This functionality has been released in v3.13.0 of the Terraform GitLab Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue. Thank you!

Required by: * gitlabhq/terraform-provider-gitlab#938

github-actions bot added documentation provider resource Adds or modifies a resource tests size/XL labels Mar 8, 2022

github-actions bot reviewed Mar 8, 2022

View reviewed changes

armsnyder marked this pull request as ready for review March 8, 2022 08:38

armsnyder added the safe to test label Mar 8, 2022

armsnyder marked this pull request as draft March 8, 2022 08:39

timofurrer mentioned this pull request Mar 10, 2022

Support Project (Protected) Environments #750

Closed

timofurrer self-requested a review March 10, 2022 15:55

timofurrer requested changes Mar 10, 2022

View reviewed changes

github-actions bot added the merge-conflict PR cannot be merged due to a merge conflict label Mar 11, 2022

github-actions bot removed the merge-conflict PR cannot be merged due to a merge conflict label Mar 11, 2022

timofurrer linked an issue Mar 13, 2022 that may be closed by this pull request

Environments support #444

Closed

timofurrer requested changes Mar 13, 2022

View reviewed changes

internal/provider/resource_gitlab_project_environment.go Outdated Show resolved Hide resolved

internal/provider/resource_gitlab_project_protected_environment.go Outdated Show resolved Hide resolved

timofurrer requested changes Mar 16, 2022

View reviewed changes

timofurrer added a commit to timofurrer/go-gitlab that referenced this pull request Mar 16, 2022

environments: Implement missing created_at and updated_at fields

f0f40a3

Required by: * gitlabhq/terraform-provider-gitlab#938

timofurrer mentioned this pull request Mar 16, 2022

environments: Implement missing created_at and updated_at fields xanzy/go-gitlab#1414

Merged

timofurrer marked this pull request as ready for review March 19, 2022 15:39

timofurrer added this to the v3.13.0 milestone Mar 20, 2022

timofurrer reviewed Mar 20, 2022

View reviewed changes

internal/provider/resource_gitlab_project_environment_test.go Show resolved Hide resolved

timofurrer reviewed Mar 20, 2022

View reviewed changes

internal/provider/resource_gitlab_project_environment_test.go Show resolved Hide resolved

timofurrer force-pushed the main branch from aff2758 to afee702 Compare March 20, 2022 15:53

timofurrer force-pushed the main branch from afee702 to 87ac3d4 Compare March 20, 2022 15:58

timofurrer previously approved these changes Mar 20, 2022

View reviewed changes

Ryan G and others added 3 commits March 23, 2022 19:26

resource/gitlab_project_*_environment: initial draft of resources

85965e2

resource/gitlab_project_*_environments: follow up on initial draft of…

dad1f89

… resources

resource/gitlab_project_*_environment: fix a few bugs and testing

92b531c

timofurrer dismissed their stale review via 92b531c March 23, 2022 18:27

timofurrer force-pushed the main branch from 87ac3d4 to 92b531c Compare March 23, 2022 18:27

timofurrer approved these changes Mar 26, 2022

View reviewed changes

timofurrer merged commit d18aee4 into gitlabhq:main Mar 26, 2022

timofurrer self-assigned this Mar 26, 2022

gravis pushed a commit to gravis/go-gitlab that referenced this pull request Sep 1, 2022

environments: Implement missing created_at and updated_at fields

0c29271

Required by: * gitlabhq/terraform-provider-gitlab#938

github-actions bot locked and limited conversation to collaborators Nov 9, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Third times a charm for protected environments #938

Third times a charm for protected environments #938

Shocktrooper commented Mar 8, 2022

github-actions bot left a comment

Shocktrooper commented Mar 8, 2022

Shocktrooper commented Mar 9, 2022

timofurrer left a comment

github-actions bot commented Mar 11, 2022

github-actions bot commented Mar 11, 2022

Shocktrooper commented Mar 16, 2022

timofurrer commented Mar 16, 2022

Shocktrooper commented Mar 16, 2022

Shocktrooper commented Mar 20, 2022

timofurrer commented Mar 20, 2022 •

edited

Loading

Shocktrooper commented Mar 20, 2022 •

edited

Loading

timofurrer commented Mar 20, 2022

Shocktrooper commented Mar 20, 2022 •

edited

Loading

timofurrer commented Mar 20, 2022

timofurrer commented Mar 20, 2022 •

edited

Loading

timofurrer left a comment

Shocktrooper commented Mar 20, 2022

timofurrer commented Mar 20, 2022

github-actions bot commented Mar 30, 2022

Third times a charm for protected environments #938

Third times a charm for protected environments #938

Conversation

Shocktrooper commented Mar 8, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

Shocktrooper commented Mar 8, 2022

Shocktrooper commented Mar 9, 2022

timofurrer left a comment

Choose a reason for hiding this comment

github-actions bot commented Mar 11, 2022

github-actions bot commented Mar 11, 2022

Shocktrooper commented Mar 16, 2022

timofurrer commented Mar 16, 2022

Shocktrooper commented Mar 16, 2022

Shocktrooper commented Mar 20, 2022

timofurrer commented Mar 20, 2022 • edited Loading

Shocktrooper commented Mar 20, 2022 • edited Loading

timofurrer commented Mar 20, 2022

Shocktrooper commented Mar 20, 2022 • edited Loading

timofurrer commented Mar 20, 2022

timofurrer commented Mar 20, 2022 • edited Loading

timofurrer left a comment

Choose a reason for hiding this comment

Shocktrooper commented Mar 20, 2022

timofurrer commented Mar 20, 2022

github-actions bot commented Mar 30, 2022

timofurrer commented Mar 20, 2022 •

edited

Loading

Shocktrooper commented Mar 20, 2022 •

edited

Loading

Shocktrooper commented Mar 20, 2022 •

edited

Loading

timofurrer commented Mar 20, 2022 •

edited

Loading