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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce maximum allowed Terraform version #21

Merged
merged 3 commits into from
Jun 8, 2024

Conversation

jbw976
Copy link
Member

@jbw976 jbw976 commented Jun 7, 2024

Description of your changes

This PR applies the changes from crossplane/upjet-provider-template#67 to this repository.

In the Crossplane project, we cannot use a version of Terraform greater than v1.5.x because of the not permitted BSL license that was introduced starting with v1.6.0.

I have:

  • Read and followed Crossplane's contribution process.
  • Run make reviewable test to ensure this PR is ready for review.

How has this code been tested

I have tested locally that the build still completes successful with make and make reviewable still passes all tests/checks. Of particular note is that no CRD schemas are affected by this change.

I would appreciate a critical look here to see if there's more manual testing we can perform to validate this change, as I am rolling this out across a number of providers I'm not super familiar with 馃槆

Signed-off-by: Jared Watts <jbw976@gmail.com>
Signed-off-by: Jared Watts <jbw976@gmail.com>
Signed-off-by: Jared Watts <jbw976@gmail.com>
@jbw976 jbw976 requested a review from smcavallo as a code owner June 7, 2024 23:51
Copy link
Member Author

Choose a reason for hiding this comment

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

here's an easier to view diff of this file from its previous version:

139c139
<                 "description": "(Required) The type of channel. One of: (user, victorops, webhook, email, opsgenie, pagerduty, slack).",
---
>                 "description": "(Required) The type of channel. One of: (email, opsgenie, pagerduty, slack, user, victorops, webhook).",
373c373
<                 "description": "The type of condition. One of: (browser_metric, mobile_metric, servers_metric, apm_app_metric, apm_jvm_metric, apm_kt_metric).",
---
>                 "description": "The type of condition. One of: (apm_jvm_metric, apm_kt_metric, browser_metric, mobile_metric, servers_metric, apm_app_metric).",
11354c11354
<                 "description": "The type of channel. One of: (slack, user, victorops, webhook, email, opsgenie, pagerduty).",
---
>                 "description": "The type of channel. One of: (pagerduty, slack, user, victorops, webhook, email, opsgenie).",
11649c11649
<           "version": 0,
---
>           "version": 1,

This looks very similar to what @ulucinar investigated in crossplane-contrib/provider-upjet-digitalocean#42 (comment), where we determined it to not be an issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

However, there is something else funny happening that I don't understand yet, perhaps the project maintainers would know better.

After running make generate, I see no file content changed, but I do see a number of API files getting their file mode updated:

diff --git a/apis/alert/v1alpha1/zz_channel_terraformed.go b/apis/alert/v1alpha1/zz_channel_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/alert/v1alpha1/zz_destination_terraformed.go b/apis/alert/v1alpha1/zz_destination_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/alert/v1alpha1/zz_generated.conversion_hubs.go b/apis/alert/v1alpha1/zz_generated.conversion_hubs.go
old mode 100644
new mode 100755
diff --git a/apis/alert/v1alpha1/zz_policy_terraformed.go b/apis/alert/v1alpha1/zz_policy_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/dashboard/v1alpha1/zz_dashboard_terraformed.go b/apis/dashboard/v1alpha1/zz_dashboard_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/dashboard/v1alpha1/zz_dashboardjson_terraformed.go b/apis/dashboard/v1alpha1/zz_dashboardjson_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/dashboard/v1alpha1/zz_generated.conversion_hubs.go b/apis/dashboard/v1alpha1/zz_generated.conversion_hubs.go
old mode 100644
new mode 100755
diff --git a/apis/log/v1alpha1/zz_generated.conversion_hubs.go b/apis/log/v1alpha1/zz_generated.conversion_hubs.go
old mode 100644
new mode 100755
diff --git a/apis/log/v1alpha1/zz_parsingrule_terraformed.go b/apis/log/v1alpha1/zz_parsingrule_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/nrql/v1alpha1/zz_alertcondition_terraformed.go b/apis/nrql/v1alpha1/zz_alertcondition_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/nrql/v1alpha1/zz_droprule_terraformed.go b/apis/nrql/v1alpha1/zz_droprule_terraformed.go
old mode 100644
new mode 100755
diff --git a/apis/nrql/v1alpha1/zz_generated.conversion_hubs.go b/apis/nrql/v1alpha1/zz_generated.conversion_hubs.go
old mode 100644
new mode 100755
diff --git a/apis/workflow/v1alpha1/zz_generated.conversion_hubs.go b/apis/workflow/v1alpha1/zz_generated.conversion_hubs.go
old mode 100644
new mode 100755
diff --git a/apis/workflow/v1alpha1/zz_workflow_terraformed.go b/apis/workflow/v1alpha1/zz_workflow_terraformed.go
old mode 100644
new mode 100755

I wonder if this is a local config/setup issue, or if it will show up in CI also. Any ideas? 馃槆

Copy link
Member Author

Choose a reason for hiding this comment

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

@jbw976 jbw976 requested a review from haarchri June 7, 2024 23:55
@haarchri haarchri merged commit 81feffb into crossplane-contrib:main Jun 8, 2024
7 checks passed
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.

None yet

2 participants