mirror of https://github.com/databricks/cli.git
Followup improvements to the Docker setup script (#1369)
## Changes This PR: 1. Uses bash to run the setup.sh script instead of the native busybox sh shipped with alpine. 2. Verifies the checksums of the installed terraform CLI binaries. ## Tests Manually. The docker image successfully builds. --------- Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>
This commit is contained in:
parent
6b81b627fe
commit
3c14204e98
|
@ -1,6 +1,7 @@
|
||||||
FROM alpine:3.19 as builder
|
FROM alpine:3.19 as builder
|
||||||
|
|
||||||
RUN ["apk", "add", "jq"]
|
RUN ["apk", "add", "jq"]
|
||||||
|
RUN ["apk", "add", "bash"]
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
|
|
|
@ -15,18 +15,40 @@ const TerraformVersionEnv = "DATABRICKS_TF_VERSION"
|
||||||
const TerraformCliConfigPathEnv = "DATABRICKS_TF_CLI_CONFIG_FILE"
|
const TerraformCliConfigPathEnv = "DATABRICKS_TF_CLI_CONFIG_FILE"
|
||||||
const TerraformProviderVersionEnv = "DATABRICKS_TF_PROVIDER_VERSION"
|
const TerraformProviderVersionEnv = "DATABRICKS_TF_PROVIDER_VERSION"
|
||||||
|
|
||||||
|
// Terraform CLI version to use and the corresponding checksums for it. The
|
||||||
|
// checksums are used to verify the integrity of the downloaded binary. Please
|
||||||
|
// update the checksums when the Terraform version is updated. The checksums
|
||||||
|
// were obtained from https://releases.hashicorp.com/terraform/1.5.5.
|
||||||
|
//
|
||||||
|
// These hashes are not used inside the CLI. They are only co-located here to be
|
||||||
|
// output in the "databricks bundle debug terraform" output. Downstream applications
|
||||||
|
// like the CLI docker image use these checksums to verify the integrity of the
|
||||||
|
// downloaded Terraform archive.
|
||||||
var TerraformVersion = version.Must(version.NewVersion("1.5.5"))
|
var TerraformVersion = version.Must(version.NewVersion("1.5.5"))
|
||||||
|
|
||||||
|
const checksumLinuxArm64 = "b055aefe343d0b710d8a7afd31aeb702b37bbf4493bb9385a709991e48dfbcd2"
|
||||||
|
const checksumLinuxAmd64 = "ad0c696c870c8525357b5127680cd79c0bdf58179af9acd091d43b1d6482da4a"
|
||||||
|
|
||||||
|
type Checksum struct {
|
||||||
|
LinuxArm64 string `json:"linux_arm64"`
|
||||||
|
LinuxAmd64 string `json:"linux_amd64"`
|
||||||
|
}
|
||||||
|
|
||||||
type TerraformMetadata struct {
|
type TerraformMetadata struct {
|
||||||
Version string `json:"version"`
|
Version string `json:"version"`
|
||||||
ProviderHost string `json:"providerHost"`
|
Checksum Checksum `json:"checksum"`
|
||||||
ProviderSource string `json:"providerSource"`
|
ProviderHost string `json:"providerHost"`
|
||||||
ProviderVersion string `json:"providerVersion"`
|
ProviderSource string `json:"providerSource"`
|
||||||
|
ProviderVersion string `json:"providerVersion"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTerraformMetadata() *TerraformMetadata {
|
func NewTerraformMetadata() *TerraformMetadata {
|
||||||
return &TerraformMetadata{
|
return &TerraformMetadata{
|
||||||
Version: TerraformVersion.String(),
|
Version: TerraformVersion.String(),
|
||||||
|
Checksum: Checksum{
|
||||||
|
LinuxArm64: checksumLinuxArm64,
|
||||||
|
LinuxAmd64: checksumLinuxAmd64,
|
||||||
|
},
|
||||||
ProviderHost: schema.ProviderHost,
|
ProviderHost: schema.ProviderHost,
|
||||||
ProviderSource: schema.ProviderSource,
|
ProviderSource: schema.ProviderSource,
|
||||||
ProviderVersion: schema.ProviderVersion,
|
ProviderVersion: schema.ProviderVersion,
|
||||||
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
package terraform
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func downloadAndChecksum(t *testing.T, url string, expectedChecksum string) {
|
||||||
|
resp, err := http.Get(url)
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("failed to download %s: %s", url, resp.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
tmpDir := t.TempDir()
|
||||||
|
tmpFile, err := os.Create(filepath.Join(tmpDir, "archive.zip"))
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer tmpFile.Close()
|
||||||
|
|
||||||
|
_, err = io.Copy(tmpFile, resp.Body)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
_, err = tmpFile.Seek(0, 0) // go back to the start of the file
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
hash := sha256.New()
|
||||||
|
_, err = io.Copy(hash, tmpFile)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
checksum := hex.EncodeToString(hash.Sum(nil))
|
||||||
|
assert.Equal(t, expectedChecksum, checksum)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTerraformArchiveChecksums(t *testing.T) {
|
||||||
|
armUrl := fmt.Sprintf("https://releases.hashicorp.com/terraform/%s/terraform_%s_linux_arm64.zip", TerraformVersion, TerraformVersion)
|
||||||
|
amdUrl := fmt.Sprintf("https://releases.hashicorp.com/terraform/%s/terraform_%s_linux_amd64.zip", TerraformVersion, TerraformVersion)
|
||||||
|
|
||||||
|
downloadAndChecksum(t, amdUrl, checksumLinuxAmd64)
|
||||||
|
downloadAndChecksum(t, armUrl, checksumLinuxArm64)
|
||||||
|
}
|
|
@ -1,12 +1,27 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
DATABRICKS_TF_VERSION=$(/app/databricks bundle debug terraform --output json | jq -r .terraform.version)
|
DATABRICKS_TF_VERSION=$(/app/databricks bundle debug terraform --output json | jq -r .terraform.version)
|
||||||
DATABRICKS_TF_PROVIDER_VERSION=$(/app/databricks bundle debug terraform --output json | jq -r .terraform.providerVersion)
|
DATABRICKS_TF_PROVIDER_VERSION=$(/app/databricks bundle debug terraform --output json | jq -r .terraform.providerVersion)
|
||||||
|
|
||||||
|
if [ $ARCH != "amd64" ] && [ $ARCH != "arm64" ]; then
|
||||||
|
echo "Unsupported architecture: $ARCH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Download the terraform binary
|
# Download the terraform binary
|
||||||
mkdir -p zip
|
mkdir -p zip
|
||||||
wget https://releases.hashicorp.com/terraform/${DATABRICKS_TF_VERSION}/terraform_${DATABRICKS_TF_VERSION}_linux_${ARCH}.zip -O zip/terraform.zip
|
wget https://releases.hashicorp.com/terraform/${DATABRICKS_TF_VERSION}/terraform_${DATABRICKS_TF_VERSION}_linux_${ARCH}.zip -O zip/terraform.zip
|
||||||
|
|
||||||
|
# Verify the checksum. This is to ensure that the downloaded archive is not tampered with.
|
||||||
|
EXPECTED_CHECKSUM="$(/app/databricks bundle debug terraform --output json | jq -r .terraform.checksum.linux_$ARCH)"
|
||||||
|
COMPUTED_CHECKSUM=$(sha256sum zip/terraform.zip | awk '{ print $1 }')
|
||||||
|
if [ "$COMPUTED_CHECKSUM" != "$EXPECTED_CHECKSUM" ]; then
|
||||||
|
echo "Checksum mismatch for Terraform binary. Version: $DATABRICKS_TF_VERSION, Arch: $ARCH, Expected checksum: $EXPECTED_CHECKSUM, Computed checksum: $COMPUTED_CHECKSUM."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Unzip the terraform binary. It's safe to do so because we have already verified the checksum.
|
||||||
unzip zip/terraform.zip -d zip/terraform
|
unzip zip/terraform.zip -d zip/terraform
|
||||||
mkdir -p /app/bin
|
mkdir -p /app/bin
|
||||||
mv zip/terraform/terraform /app/bin/terraform
|
mv zip/terraform/terraform /app/bin/terraform
|
||||||
|
|
Loading…
Reference in New Issue