Skip to content

Commit

Permalink
Merge pull request #3 from constellationautomotivegroup/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
RolfMoleman authored Jan 31, 2024
2 parents 0966bb0 + 6eae66a commit 362c62e
Show file tree
Hide file tree
Showing 8 changed files with 262 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ updates:
directory: "/dummy_terraform/"
schedule:
interval: "daily"
time: "08:00"
time: "23:00"
timezone: "Europe/London"
170 changes: 170 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"addLabels": ["renovate"],
"allowPlugins": true,
"assignAutomerge": true,
"assignees": [],
"assigneesFromCodeOwners": true,
"assigneesSampleSize": 2,
"autoApprove": true,
"autodiscover": false,
"automerge": true,
"automergeComment": "automergeComment",
"automergeSchedule": ["at any time"],
"automergeStrategy": "merge",
"automergeType": "pr",
"azure-pipelines": {
"enabled": true,
"fileMatch": ["\\.ya?ml$"]
},
"azureWorkItemId": 0,
"baseBranches": ["develop"],
"bicep": {
"fileMatch": ["\\.bicep$"]
},
"cloneSubmodules": true,
"configMigration": true,
"configWarningReuseIssue": false,
"dependencyDashboard": true,
"dependencyDashboardAutoclose": true,
"description": "standard config",
"dockerfile": {
"fileMatch": [
"(^|/|\\.)([Dd]ocker|[Cc]ontainer)file$",
"(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$"
]
},
"enabled": true,
"exposeAllEnv": false,
"extends": ["config:recommended", "github>constellationautomotivegroup/Terraform-chocolatey-packages"],
"fetchChangeLogs": "pr",
"forkMode": true,
"forkPr": true,
"forkProcessing": "enabled",
"git-submodules": {
"enabled": false,
"fileMatch": ["(^|/)\\.gitmodules$"],
"versioning": "git"
},
"gitAuthor": "Renovate <[email protected]>",
"github-actions": {
"fileMatch": [
"^(workflow-templates|\\.(?:github|gitea|forgejo)/workflows)/[^/]+\\.ya?ml$",
"(^|/)action\\.ya?ml$"
]
},
"githubTokenWarn": true,
"gomod": {
"fileMatch": ["(^|/)go\\.mod$"],
"pinDigests": false
},
"group": {
"branchTopic": "{{{groupSlug}}}",
"commitMessageTopic": "{{{groupName}}}"
},
"helm-requirements": {
"commitMessageTopic": "helm chart {{depName}}",
"fileMatch": ["(^|/)requirements\\.ya?ml$"],
"registryAliases": {
"stable": "https://charts.helm.sh/stable"
}
},
"helm-values": {
"commitMessageTopic": "helm values {{depName}}",
"fileMatch": ["(^|/)values\\.ya?ml$"],
"pinDigests": false
},
"helmfile": {
"commitMessageTopic": "helm chart {{depName}}",
"fileMatch": ["(^|/)helmfile\\.ya?ml$"],
"registryAliases": {
"stable": "https://charts.helm.sh/stable"
}
},
"helmv3": {
"commitMessageTopic": "helm chart {{depName}}",
"fileMatch": ["(^|/)Chart\\.ya?ml$"],
"registryAliases": {
"stable": "https://charts.helm.sh/stable"
}
},
"homebrew": {
"commitMessageTopic": "Homebrew Formula {{depName}}",
"fileMatch": ["^Formula/[^/]+[.]rb$"]
},
"hostRules": [
{
"hostType": "github",
"hostName": "github.com",
"repository": "jsmestoyer/chocolatey-packages",
"organization": "constellationautomotivegroup"
}
],
"html": {
"digest": {
"enabled": false
},
"fileMatch": ["\\.html?$"],
"pinDigests": false,
"versioning": "semver"
},
"ignoreDeprecated": true,
"ignoreScripts": false,
"ignoreUnstable": true,
"kotlin-script": {
"fileMatch": ["^.+\\.main\\.kts$"]
},
"kubernetes": {
"fileMatch": []
},
"kustomize": {
"fileMatch": ["(^|/)kustomization\\.ya?ml$"],
"pinDigests": false
},
"labels": [],
"logFile": "",
"logFileLevel": "debug",
"major": {
"autoApprove": false,
"autodiscover": true,
"automerge": false,
"automergeComment": "Automatically update Major version",
"automergeSchedule": ["at any time"],
"automergeStrategy": "merge",
"automergeType": "pr",
"description": "DO NOT automatically update and approve major versions"
},
"maven": {
"fileMatch": [
"(^|/|\\.)pom\\.xml$",
"^(((\\.mvn)|(\\.m2))/)?settings\\.xml$"
],
"versioning": "maven"
},
"maven-wrapper": {
"fileMatch": ["(^|\\/).mvn/wrapper/maven-wrapper.properties$"],
"versioning": "maven"
},
"minor": {
"autoApprove": true,
"autodiscover": true,
"automerge": true,
"automergeComment": "Automatically update minor version",
"automergeSchedule": ["at any time"],
"automergeStrategy": "merge",
"automergeType": "pr",
"description": "Automatically update and approve minor versions"
},
"nodenv": {
"fileMatch": ["(^|/)\\.node-version$"],
"versioning": "node"
},
"npm": {
"digest": {
"prBodyDefinitions": {
"Change": "{{#if displayFrom}}`{{{displayFrom}}}` -> {{else}}{{#if currentValue}}`{{{currentValue}}}` -> {{/if}}{{/if}}{{#if displayTo}}`{{{displayTo}}}`{{else}}`{{{newValue}}}`{{/if}}"
}
},
"fileMatch": ["(^|/)package\\.json$"],
"prBodyDefinitions": {
"Change": "[{{#if displayFrom}}`{{{displayFrom}}}` -> {{else}}{{#if currentValue}}`{{{currentValue}}}` -> {{/if}}{{/if}}{{#if displayTo}}`{{{displayTo}}}`{{else}}
71 changes: 71 additions & 0 deletions .github/workflows/Auto update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Automatically update terraform.nuspec
concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
permissions:
contents: write
pull-requests: write
on:
create:
workflow_dispatch:

jobs:
job1:
name: "dependabot-auto-update"
runs-on: windows-latest
if: ${{ startsWith(github.ref, 'refs/heads/dependabot/') }}
steps:
- uses: actions/checkout@v4

- name: Install AU Module
run: |
Set-PSRepository PSGallery -InstallationPolicy Trusted
Install-Module AU
Get-Module AU -ListAvailable
- name: build package
shell: pwsh
working-directory: ./terraform
run: ./update.ps1

- name: Configure git
working-directory: ./terraform
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Commit changes to terraform.nuspec
working-directory: ./terraform
run: |
git add terraform.nuspec
git commit -m "[dependabot skip] Update terraform.nuspec"
job2:
name: "renovate-auto-update"
runs-on: windows-latest
if: ${{ startsWith(github.ref, 'refs/heads/renovate/') }}
steps:
- uses: actions/checkout@v4

- name: Install AU Module
run: |
Set-PSRepository PSGallery -InstallationPolicy Trusted
Install-Module AU
Get-Module AU -ListAvailable
- name: build package
shell: pwsh
working-directory: ./terraform
run: ./update.ps1

- name: Configure git
working-directory: ./terraform
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Commit changes to terraform.nuspec
working-directory: ./terraform
run: |
git add terraform.nuspec
git commit -m "Update terraform.nuspec"
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: terraform -version

- name: Save Choco package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: terraform
path: "${{ github.workspace }}/*.nupkg"
Expand All @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4

- name: Restore Choco package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: terraform
path: ${{ github.workspace }}
Expand Down
12 changes: 6 additions & 6 deletions terraform/terraform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
<id>terraform</id>
<title>Terraform</title>
<version>1.6.6</version>
<version>1.7.1</version>
<authors>Mitchell Hashimoto, HashiCorp</authors>
<owners>James Toyer</owners>
<summary>Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions.</summary>
Expand All @@ -22,15 +22,15 @@ The key features of Terraform are:
For more information, see the [introduction section](http://www.terraform.io/intro) of the Terraform website.
</description>
<releaseNotes>
## 1.6.6 (December 13, 2023)
## 1.7.1 (January 24, 2024)

BUG FIXES:
* `terraform test`: Stop attempting to destroy run blocks that have no actual infrastructure to destroy. This fixes an issue where attempts to destroy "verification" run blocks that load only data sources would fail if the underlying infrastructure referenced by the run blocks had already been destroyed. ([#34331](https://github.com/hashicorp/terraform/pull/34331))
* cloud: prevent running saved cloud plans in VCS-connected workspaces. Saved plans might be applied later, and VCS workspaces shouldn't apply configurations that don't come from their designated VCS branch.
* core: Unmanaged plugins (mainly used by provider acceptance testing) would not have a provider address set, preventing the caching of their schemas ([#34380](https://github.com/hashicorp/terraform/issues/34380))

* `terraform test`: Fix crash when referencing variables or functions within the file level `variables` block. ([#34531](https://github.com/hashicorp/terraform/issues/34531))
* `terraform test`: Fix crash when `override_module` block was missing the `outputs` attribute. ([#34563](https://github.com/hashicorp/terraform/issues/34563))

## Previous Releases
For more information on previous releases, check out the changelog on [GitHub](https://github.com/hashicorp/terraform/blob/v1.6.6/CHANGELOG.md).</releaseNotes>
For more information on previous releases, check out the changelog on [GitHub](https://github.com/hashicorp/terraform/blob/v1.7.1/CHANGELOG.md).</releaseNotes>
<projectUrl>http://www.terraform.io</projectUrl>
<docsUrl>https://www.terraform.io/docs/index.html</docsUrl>
<bugTrackerUrl>https://github.com/hashicorp/terraform/issues</bugTrackerUrl>
Expand Down
8 changes: 4 additions & 4 deletions terraform/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$ErrorActionPreference = 'Stop'

# DO NOT CHANGE THESE MANUALLY. USE update.ps1
$url = 'https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_windows_386.zip'
$url64 = 'https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_windows_amd64.zip'
$checksum = '56b03a9617c29862a8d9795c37613714ccea7b29e3a348d09ba37d23001c3b0e'
$checksum64 = '086df90269a7169b9be9051834a8fe1459a6c7f8fea88f228434740c5820cabe'
$url = 'https://releases.hashicorp.com/terraform/1.7.1/terraform_1.7.1_windows_386.zip'
$url64 = 'https://releases.hashicorp.com/terraform/1.7.1/terraform_1.7.1_windows_amd64.zip'
$checksum = '9932217e7a4893fa6835fba740672e6fb5d977636cc9d6cfbc763b2a983460b0'
$checksum64 = '4591dd644cd668d0efaeb8f32e9f1fddec95d07d40a8b6e6e1d5cb7b89bf05f6'

$unzipLocation = Split-Path -Parent $MyInvocation.MyCommand.Definition

Expand Down
10 changes: 5 additions & 5 deletions terraform/update.ps1
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Requires -Version 5.0
#Requires -Modules AU
[cmdletbinding()]
param (
[switch]$Force
#Requires -Version 5.0
#Requires -Modules AU
[cmdletbinding()]
param (
[switch]$Force
)

Set-StrictMode -Version Latest
Expand Down
3 changes: 3 additions & 0 deletions terraform/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
terraform{
required_version ="1.6.6"
}

0 comments on commit 362c62e

Please sign in to comment.