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

Fix: support naming a terraform provider #2794

Merged
merged 3 commits into from Nov 25, 2021

Conversation

zzxwill
Copy link
Collaborator

@zzxwill zzxwill commented Nov 24, 2021

Support set the name for a terraform provider.

Fix #2595

Description of your changes

Fixes #

I have:

  • Read and followed KubeVela's contribution process.
  • Related Docs updated properly. In a new feature or configuration option, an update to the documentation is necessary.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Special notes for your reviewer

Support set the name for a terraform provider.

Fix kubevela#2595
@@ -24,6 +24,9 @@ import (
"text/template"
"time"

terraformv1beta1 "github.com/oam-dev/terraform-controller/api/v1beta1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe reorganize the imports?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sure.

@codecov
Copy link

codecov bot commented Nov 24, 2021

Codecov Report

Merging #2794 (548143a) into master (e5a86ef) will increase coverage by 4.92%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2794      +/-   ##
==========================================
+ Coverage   54.86%   59.78%   +4.92%     
==========================================
  Files         136      223      +87     
  Lines       13643    22904    +9261     
==========================================
+ Hits         7485    13694    +6209     
- Misses       5278     7542    +2264     
- Partials      880     1668     +788     
Flag Coverage Δ
apiserver-unittests 26.77% <ø> (?)
core-unittests 54.74% <ø> (-0.12%) ⬇️
e2e-multicluster-test 23.34% <ø> (?)
e2e-rollout-tests 30.77% <ø> (?)
e2etests 36.32% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...r/core.oam.dev/v1alpha2/application/dispatch/gc.go 62.06% <0.00%> (-5.58%) ⬇️
...tepdefinition/workflowstepdefinition_controller.go 63.82% <0.00%> (-5.32%) ⬇️
pkg/cue/model/value/value.go 83.17% <0.00%> (-0.10%) ⬇️
apis/core.oam.dev/v1beta1/core_types.go 50.00% <0.00%> (ø)
apis/core.oam.dev/v1beta1/application_types.go 20.00% <0.00%> (ø)
pkg/apiserver/rest/webservice/webservice.go 96.00% <0.00%> (ø)
pkg/apiserver/log/logger.go 100.00% <0.00%> (ø)
apis/core.oam.dev/v1alpha2/conversion.go 47.91% <0.00%> (ø)
pkg/apiserver/model/workflow.go 100.00% <0.00%> (ø)
apis/standard.oam.dev/v1alpha1/register.go 100.00% <0.00%> (ø)
... and 157 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e5a86ef...548143a. Read the comment docs.

@Somefive Somefive merged commit 40f100e into kubevela:master Nov 25, 2021
@zzxwill zzxwill deleted the addon-terraform-name branch November 25, 2021 03:06
@zzxwill
Copy link
Collaborator Author

zzxwill commented Nov 29, 2021

/backport 1.1

@github-actions
Copy link

Backport failed for release-1.1, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-1.1
git worktree add -d .worktree/backport-2794-to-release-1.1 origin/release-1.1
cd .worktree/backport-2794-to-release-1.1
git checkout -b backport-2794-to-release-1.1
ancref=$(git merge-base 3d2fcacb5a98af841b4b69995a0be204f6062c81 548143a00443000493811854867c5c37572c35b2)
git cherry-pick -x $ancref..548143a00443000493811854867c5c37572c35b2

zzxwill added a commit to zzxwill/kubevela that referenced this pull request Nov 29, 2021
- Fix: upgrade terraform controller to v0.2.10 kubevela#2827
- Fix: support naming a terraform provider kubevela#2794
@zzxwill zzxwill mentioned this pull request Nov 29, 2021
4 tasks
zzxwill added a commit to zzxwill/kubevela that referenced this pull request Nov 30, 2021
- Fix: upgrade terraform controller to v0.2.10 kubevela#2827
- Fix: support naming a terraform provider kubevela#2794

Signed-off-by: zzxwill <zzxwill@gmail.com>
zzxwill added a commit to zzxwill/kubevela that referenced this pull request Nov 30, 2021
- Fix: upgrade terraform controller to v0.2.10 kubevela#2827
- Fix: support naming a terraform provider kubevela#2794

Signed-off-by: zzxwill <zzxwill@gmail.com>
wonderflow pushed a commit that referenced this pull request Nov 30, 2021
- Fix: upgrade terraform controller to v0.2.10 #2827
- Fix: support naming a terraform provider #2794

Signed-off-by: zzxwill <zzxwill@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow specifying a Terraform component's referenced Provider in an application
4 participants