Bump github.com/onsi/gomega from 1.28.1 to 1.30.0

.github/auto-merge.yml

@@ -0,0 +1,3 @@
+- match:
+    dependency_type: all
+    update_type: "semver:patch"

.github/dependabot.yml

@@ -0,0 +1,21 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/after-merge-dependabot.yml

@@ -0,0 +1,57 @@
+name: after-merge-dependabot
+
+on:
+  pull_request_target:
+    types: [closed]
+
+jobs:
+  check:
+    if: github.event.pull_request.merged && github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    concurrency:
+      group: dependabot-after-merge
+      cancel-in-progress: true
+    steps:
+      - name: Fetch dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - uses: oprypin/find-latest-tag@v1
+        id: octokit
+        with:
+          repository: ${{ github.repository }}
+          prefix: v
+
+      - name: Parse last release
+        id: semver_parser
+        uses: booxmedialtd/ws-action-parse-semver@v1
+        with:
+          input_string: '${{ steps.octokit.outputs.tag }}'
+          version_extractor_regex: 'v(.*)$'
+
+      - name: Compute tag
+        id: compte_tag
+        run: |
+          major=${{ steps.semver_parser.outputs.major }}
+          minor=${{ steps.semver_parser.outputs.minor }}
+          patch=${{ steps.semver_parser.outputs.patch }}
+          if [ "${{ steps.dependabot-metadata.outputs.update-type  }}" == "version-update:semver-minor" ]; then
+            minor=$((minor+1))
+            patch=0
+            echo "::warning::bumping minor version"
+          elif [ "${{ steps.dependabot-metadata.outputs.update-type  }}" == "version-update:semver-patch" ]; then
+            patch=$((patch+1))
+            echo "::warning::bumping patch version"
+          fi
+          tag="v${major}.${minor}.${patch}"
+          echo "::set-output name=tag::${tag}"
+          echo "::warning::tag == ${tag}"
+
+      - name: Create tag
+        uses: tvdias/[email protected]
+        if: steps.compte_tag.outputs.tag != steps.semver_parser.outputs.fullversion
+        with:
+          repo-token: "${{ secrets.AUTO_MERGE_TOKEN }}"
+          tag: "${{ steps.compte_tag.outputs.tag }}"

.github/workflows/auto-accept-dependabot.yml

@@ -0,0 +1,20 @@
+name: auto-accept-dependabot
+
+on:
+  pull_request_target:
+
+jobs:
+  auto-merge:
+    if: github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          config: .github/auto-merge.yml
+          command: "squash and merge"
+          github-token: ${{ secrets.AUTO_MERGE_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '29 22 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/goreleaser.yml

@@ -0,0 +1,58 @@
+name: goreleaser
+
+on:
+  push:
+    # not not consider simplec commit
+    branches:
+      - '!*'
+    # consider only release and pre-release tags
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: set up go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+
+      - name: cache go modules
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: tests modules
+        run: |
+          go mod vendor
+          if [ ! -z "$(git status --porcelain)" ]; then
+            echo "::error::vendor directory if not synched with go.mod, please run go mod vendor"
+            exit 1
+          fi
+
+      - name: packr2
+        run: |
+          curl -fsSL https://github.com/gobuffalo/packr/releases/download/v2.8.1/packr_2.8.1_linux_amd64.tar.gz | \
+            tar -xz -C /usr/local/bin/ packr2
+          which packr2
+
+      - name: run goreleaser
+        uses: goreleaser/goreleaser-action@v5
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        with:
+          version: latest
+          args: release --rm-dist -p 1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USER: github-actions

.gitignore

@@ -39,3 +39,5 @@ bbl/debug
 # packrd
 **/*-packr.go
 bbl/packrd
+/dist
+/bbl/bbl

.goreleaser.yml

@@ -0,0 +1,57 @@
+project_name: bosh-bootloader
+
+builds:
+  -
+    &template
+    id: binary
+    dir: bbl
+    binary: bbl
+    env:
+      - CGO_ENABLED=0
+      - TF_VERSION=1.4.2
+    ldflags:
+      - -s
+      - -w
+      - -X main.Version={{.Version}}-ora
+    hooks:
+      pre:
+        - cmd: ./scripts/terraform_dist
+          env:
+            - GOOS={{.Os}}
+            - GOARCH={{.Arch}}
+        - cmd: bash -c "source ./scripts/create_mod && create_mod"
+        - cmd: ./scripts/generate
+    goos:
+      - darwin
+      - linux
+    goarch:
+      - amd64
+
+archives:
+  - id: archives
+    builds:
+      - binary
+    format: "tar.gz"
+    name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+    wrap_in_directory: true
+    files:
+      - LICENSE*
+      - README*
+      - CHANGELOG*
+      - docs/*
+      - assets/*
+      - static/*
+      - templates/*
+      - ./*/static/*
+      - ./*/templates/*
+
+checksum:
+  name_template: checksums.txt
+  algorithm: sha256
+
+release:
+  github:
+    owner: orange-cloudfoundry
+    name: bosh-bootloader
+  prerelease: auto
+  name_template: '{{.Tag}}'

README.md

@@ -40,6 +40,7 @@ $ brew install bbl
 - [Getting Started: AWS](docs/getting-started-aws.md)
 - [Getting Started: vSphere](docs/getting-started-vsphere.md)
 - [Getting Started: OpenStack](docs/getting-started-openstack.md)
+- [Getting Started: CloudStack](docs/getting-started-cloudstack.md)
 
 ### Managing state
 

acceptance-tests/actors/cloudstack.go

@@ -0,0 +1,24 @@
+package actors
+
+func NewCloudStackLBHelper() vSphereLBHelper {
+	return vSphereLBHelper{}
+}
+
+type cloudstackHelper struct {
+}
+
+func (cloudstackHelper) GetLBArgs() []string {
+	return []string{}
+}
+
+func (cloudstackHelper) VerifyCloudConfigExtensions(vmExtensions []string) {
+}
+
+func (cloudstackHelper) ConfirmLBsExist(envID string) {
+}
+
+func (cloudstackHelper) ConfirmNoLBsExist(envID string) {
+}
+
+func (cloudstackHelper) VerifyBblLBOutput(stdout string) {
+}

acceptance-tests/actors/iaas_helper.go

@@ -27,6 +27,8 @@ func NewIAASLBHelper(iaas string, configuration acceptance.Config) IAASLBHelper
 		return NewVSphereLBHelper()
 	case "openstack":
 		return NewOpenStackLBHelper()
+	case "cloudstack":
+		return NewCloudStackLBHelper()
 	default:
 		panic(fmt.Sprintf("%s is not a supported iaas", iaas))
 	}

acceptance-tests/no-iaas/flags_error_test.go

@@ -16,7 +16,7 @@ var _ = Describe("bbl", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(session).Should(gexec.Exit(1))
 
-			Expect(string(session.Err.Contents())).To(ContainSubstring("--iaas [gcp, aws, azure, vsphere, openstack] must be provided or BBL_IAAS must be set"))
+			Expect(string(session.Err.Contents())).To(ContainSubstring("--iaas [gcp, aws, azure, vsphere, openstack, cloudstack] must be provided or BBL_IAAS must be set"))
 			Expect(string(session.Err.Contents())).NotTo(ContainSubstring("panic"))
 		})
 	})

bbl/main.go

@@ -29,12 +29,14 @@ import (
 
 	awscloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/aws"
 	azurecloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/azure"
+	cloudstackcloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/cloudstack"
 	gcpcloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/gcp"
 	openstackcloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/openstack"
 	vspherecloudconfig "github.com/cloudfoundry/bosh-bootloader/cloudconfig/vsphere"
 
 	awsterraform "github.com/cloudfoundry/bosh-bootloader/terraform/aws"
 	azureterraform "github.com/cloudfoundry/bosh-bootloader/terraform/azure"
+	cloudstackterraform "github.com/cloudfoundry/bosh-bootloader/terraform/cloudstack"
 	gcpterraform "github.com/cloudfoundry/bosh-bootloader/terraform/gcp"
 	openstackterraform "github.com/cloudfoundry/bosh-bootloader/terraform/openstack"
 	vsphereterraform "github.com/cloudfoundry/bosh-bootloader/terraform/vsphere"
@@ -106,7 +108,7 @@ func main() {
 		terraformCLI = bufferingCLI
 		out = ioutil.Discard
 	}
-	terraformExecutor := terraform.NewExecutor(terraformCLI, bufferingCLI, stateStore, afs, appConfig.Global.Debug, out)
+	terraformExecutor := terraform.NewExecutor(terraformCLI, bufferingCLI, stateStore, afs, appConfig.Global.Debug, out, globals.NoConfirm)
 
 	// BOSH
 	boshPath, err := config.GetBOSHPath()
@@ -245,6 +247,13 @@ func main() {
 		terraformManager = terraform.NewManager(terraformExecutor, templateGenerator, inputGenerator, terraformOutputBuffer, logger)
 
 		cloudConfigOpsGenerator = openstackcloudconfig.NewOpsGenerator(terraformManager)
+	case "cloudstack":
+		templateGenerator = cloudstackterraform.NewTemplateGenerator()
+		inputGenerator = cloudstackterraform.NewInputGenerator()
+
+		terraformManager = terraform.NewManager(terraformExecutor, templateGenerator, inputGenerator, terraformOutputBuffer, logger)
+
+		cloudConfigOpsGenerator = cloudstackcloudconfig.NewOpsGenerator(terraformManager)
 	}
 
 	cloudConfigManager := cloudconfig.NewManager(logger, configUpdater, stateStore, cloudConfigOpsGenerator, terraformManager, afs)