mirror of https://github.com/databricks/cli.git
Rename bricks -> databricks (#389)
## Changes Rename all instances of "bricks" to "databricks". ## Tests * Confirmed the goreleaser build works, uses the correct new binary name, and produces the right archives. * Help output is confirmed to be correct. * Output of `git grep -w bricks` is minimal with a couple changes remaining for after the repository rename.
This commit is contained in:
parent
180dfc9a40
commit
98ebb78c9b
|
@ -5,10 +5,10 @@ package account
|
|||
{{$excludes := list}}
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/spf13/cobra"
|
||||
{{range .Services}}{{if .IsAccounts}}{{if not (in $excludes .KebabName) }}
|
||||
{{.SnakeName}} "github.com/databricks/bricks/cmd/account/{{(.TrimPrefix "account").KebabName}}"{{end}}{{end}}{{end}}
|
||||
{{.SnakeName}} "github.com/databricks/cli/cmd/account/{{(.TrimPrefix "account").KebabName}}"{{end}}{{end}}{{end}}
|
||||
)
|
||||
|
||||
var accountCmd = &cobra.Command{
|
||||
|
|
|
@ -5,9 +5,9 @@ package cmd
|
|||
{{$excludes := list "command-execution" "statement-execution" "dbfs" "dbsql-permissions"}}
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
{{range .Services}}{{if not .IsAccounts}}{{if not (in $excludes .KebabName) }}
|
||||
{{.SnakeName}} "github.com/databricks/bricks/cmd/workspace/{{.KebabName}}"{{end}}{{end}}{{end}}
|
||||
{{.SnakeName}} "github.com/databricks/cli/cmd/workspace/{{.KebabName}}"{{end}}{{end}}{{end}}
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
package {{(.TrimPrefix "account").SnakeName}}
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/flags"
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/flags"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/databricks-sdk-go/service/{{.Package.Name}}"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -52,23 +52,23 @@ jobs:
|
|||
- name: Upload macOS binaries
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: bricks_darwin_snapshot
|
||||
name: cli_darwin_snapshot
|
||||
path: |
|
||||
dist/bricks_darwin_*/
|
||||
dist/*_darwin_*/
|
||||
|
||||
- name: Upload Linux binaries
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: bricks_linux_snapshot
|
||||
name: cli_linux_snapshot
|
||||
path: |
|
||||
dist/bricks_linux_*/
|
||||
dist/*_linux_*/
|
||||
|
||||
- name: Upload Windows binaries
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: bricks_windows_snapshot
|
||||
name: cli_windows_snapshot
|
||||
path: |
|
||||
dist/bricks_windows_*/
|
||||
dist/*_windows_*/
|
||||
|
||||
- name: Update snapshot tag
|
||||
|
||||
|
@ -91,4 +91,4 @@ jobs:
|
|||
tag_name: snapshot
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
files: |
|
||||
dist/bricks*.zip
|
||||
dist/databricks_cli_*.zip
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*.dll
|
||||
*.so
|
||||
*.dylib
|
||||
bricks
|
||||
cli
|
||||
|
||||
# Test binary, built with `go test -c`
|
||||
*.test
|
||||
|
|
|
@ -9,24 +9,24 @@ builds:
|
|||
- -trimpath
|
||||
ldflags:
|
||||
- '-s -w'
|
||||
- -X github.com/databricks/bricks/internal/build.buildProjectName={{ .ProjectName }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildVersion={{ .Version }}
|
||||
- -X github.com/databricks/cli/internal/build.buildProjectName={{ .ProjectName }}
|
||||
- -X github.com/databricks/cli/internal/build.buildVersion={{ .Version }}
|
||||
|
||||
# Git information
|
||||
- -X github.com/databricks/bricks/internal/build.buildBranch={{ .Branch }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildTag={{ .Tag }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildShortCommit={{ .ShortCommit }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildFullCommit={{ .FullCommit }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildCommitTimestamp={{ .CommitTimestamp }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildSummary={{ .Summary }}
|
||||
- -X github.com/databricks/cli/internal/build.buildBranch={{ .Branch }}
|
||||
- -X github.com/databricks/cli/internal/build.buildTag={{ .Tag }}
|
||||
- -X github.com/databricks/cli/internal/build.buildShortCommit={{ .ShortCommit }}
|
||||
- -X github.com/databricks/cli/internal/build.buildFullCommit={{ .FullCommit }}
|
||||
- -X github.com/databricks/cli/internal/build.buildCommitTimestamp={{ .CommitTimestamp }}
|
||||
- -X github.com/databricks/cli/internal/build.buildSummary={{ .Summary }}
|
||||
|
||||
# Version information
|
||||
- -X github.com/databricks/bricks/internal/build.buildMajor={{ .Major }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildMinor={{ .Minor }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildPatch={{ .Patch }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildPrerelease={{ .Prerelease }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildIsSnapshot={{ .IsSnapshot }}
|
||||
- -X github.com/databricks/bricks/internal/build.buildTimestamp={{ .Timestamp }}
|
||||
- -X github.com/databricks/cli/internal/build.buildMajor={{ .Major }}
|
||||
- -X github.com/databricks/cli/internal/build.buildMinor={{ .Minor }}
|
||||
- -X github.com/databricks/cli/internal/build.buildPatch={{ .Patch }}
|
||||
- -X github.com/databricks/cli/internal/build.buildPrerelease={{ .Prerelease }}
|
||||
- -X github.com/databricks/cli/internal/build.buildIsSnapshot={{ .IsSnapshot }}
|
||||
- -X github.com/databricks/cli/internal/build.buildTimestamp={{ .Timestamp }}
|
||||
|
||||
goos:
|
||||
- windows
|
||||
|
@ -41,7 +41,7 @@ builds:
|
|||
goarch: '386'
|
||||
- goos: linux
|
||||
goarch: '386'
|
||||
binary: '{{ .ProjectName }}'
|
||||
binary: databricks
|
||||
archives:
|
||||
- format: zip
|
||||
|
||||
|
@ -49,10 +49,10 @@ archives:
|
|||
# Snapshot archives must have a stable file name such that the artifacts in the nightly
|
||||
# release are automatically overwritten. If the snapshot version is included in the
|
||||
# file name then additional logic to clean up older builds would be needed.
|
||||
name_template: '{{ .ProjectName }}_{{ if not .IsSnapshot }}{{ .Version }}_{{ end }}{{ .Os }}_{{ .Arch }}'
|
||||
name_template: 'databricks_cli_{{ if not .IsSnapshot }}{{ .Version }}_{{ end }}{{ .Os }}_{{ .Arch }}'
|
||||
|
||||
checksum:
|
||||
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
|
||||
name_template: 'databricks_cli_{{ .Version }}_SHA256SUMS'
|
||||
algorithm: sha256
|
||||
snapshot:
|
||||
name_template: '{{ incpatch .Version }}-dev+{{ .ShortCommit }}'
|
||||
|
|
|
@ -5,5 +5,7 @@
|
|||
},
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"files.insertFinalNewline": true,
|
||||
"files.trimFinalNewlines": true
|
||||
"files.trimFinalNewlines": true,
|
||||
"python.envFile": "${workspaceFolder}/.databricks/.databricks.env",
|
||||
"databricks.python.envFile": "${workspaceFolder}/.env"
|
||||
}
|
||||
|
|
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -1,16 +1,16 @@
|
|||
# Version changelog
|
||||
|
||||
## 0.0.32
|
||||
* Add support for variables in bundle config. Introduces 4 ways of setting variable values, which in decreasing order of priority are: ([#383](https://github.com/databricks/bricks/pull/383))([#359](https://github.com/databricks/bricks/pull/359)).
|
||||
* Add support for variables in bundle config. Introduces 4 ways of setting variable values, which in decreasing order of priority are: ([#383](https://github.com/databricks/cli/pull/383))([#359](https://github.com/databricks/cli/pull/359)).
|
||||
1. Command line flag. For example: `--var="foo=bar"`
|
||||
2. Environment variable. eg: BUNDLE_VAR_foo=bar
|
||||
3. Default value as defined in the applicable environments block
|
||||
4. Default value defined in variable definition
|
||||
* Make the git details bundle config block optional ([#372](https://github.com/databricks/bricks/pull/372)).
|
||||
* Fix api post integration tests ([#371](https://github.com/databricks/bricks/pull/371)).
|
||||
* Fix table of content by removing not required top-level item ([#366](https://github.com/databricks/bricks/pull/366)).
|
||||
* Fix printing the tasks in job output in DAG execution order ([#377](https://github.com/databricks/bricks/pull/377)).
|
||||
* Improved error message when 'bricks bundle run' is executed before 'bricks bundle deploy' ([#378](https://github.com/databricks/bricks/pull/378)).
|
||||
* Make the git details bundle config block optional ([#372](https://github.com/databricks/cli/pull/372)).
|
||||
* Fix api post integration tests ([#371](https://github.com/databricks/cli/pull/371)).
|
||||
* Fix table of content by removing not required top-level item ([#366](https://github.com/databricks/cli/pull/366)).
|
||||
* Fix printing the tasks in job output in DAG execution order ([#377](https://github.com/databricks/cli/pull/377)).
|
||||
* Improved error message when 'bricks bundle run' is executed before 'bricks bundle deploy' ([#378](https://github.com/databricks/cli/pull/378)).
|
||||
|
||||
## 0.0.31
|
||||
|
||||
|
@ -22,4 +22,4 @@
|
|||
|
||||
## 0.0.30
|
||||
|
||||
* Initial preview release of the Bricks CLI.
|
||||
* Initial preview release of the Databricks CLI.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Bricks CLI
|
||||
# Databricks CLI
|
||||
|
||||
[![build](https://github.com/databricks/bricks/workflows/build/badge.svg?branch=main)](https://github.com/databricks/bricks/actions?query=workflow%3Abuild+branch%3Amain)
|
||||
[![build](https://github.com/databricks/cli/workflows/build/badge.svg?branch=main)](https://github.com/databricks/cli/actions?query=workflow%3Abuild+branch%3Amain)
|
||||
|
||||
This project is in private preview.
|
||||
|
||||
|
@ -12,9 +12,9 @@ Documentation is available at https://docs.databricks.com/dev-tools/cli/bricks-c
|
|||
|
||||
This CLI is packaged as a dependency-free binary executable and may be located in any directory.
|
||||
|
||||
For convenient access, copy the `bricks` binary to any directory listed in `$PATH`.
|
||||
For convenient access, copy the `databricks` binary to any directory listed in `$PATH`.
|
||||
|
||||
Confirm the binary works by executing `bricks version`.
|
||||
Confirm the binary works by executing `databricks version`.
|
||||
|
||||
## Authentication
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"golang.org/x/exp/maps"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/artifacts/notebook"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/artifacts/notebook"
|
||||
)
|
||||
|
||||
func BuildAll() bundle.Mutator {
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/databricks-sdk-go/service/workspace"
|
||||
)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
"os"
|
||||
"path"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/databricks-sdk-go/service/workspace"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/artifacts/notebook"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/artifacts/notebook"
|
||||
)
|
||||
|
||||
func UploadAll() bundle.Mutator {
|
||||
|
|
|
@ -12,11 +12,11 @@ import (
|
|||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/folders"
|
||||
"github.com/databricks/bricks/libs/git"
|
||||
"github.com/databricks/bricks/libs/locker"
|
||||
"github.com/databricks/bricks/libs/terraform"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/folders"
|
||||
"github.com/databricks/cli/libs/git"
|
||||
"github.com/databricks/cli/libs/locker"
|
||||
"github.com/databricks/cli/libs/terraform"
|
||||
"github.com/databricks/databricks-sdk-go"
|
||||
sdkconfig "github.com/databricks/databricks-sdk-go/config"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"golang.org/x/exp/maps"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
|
|
@ -3,8 +3,8 @@ package interpolation
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
)
|
||||
|
||||
type defineDefaultEnvironment struct {
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -3,7 +3,7 @@ package mutator
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"fmt"
|
||||
"path"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type defineDefaultWorkspacePaths struct{}
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type defineDefaultWorkspaceRoot struct{}
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type expandWorkspaceRoot struct{}
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/databricks/databricks-sdk-go/service/iam"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
@ -3,9 +3,9 @@ package mutator
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/git"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/git"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
type loadGitDetails struct{}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package mutator
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
func DefaultMutators() []bundle.Mutator {
|
||||
|
|
|
@ -3,7 +3,7 @@ package mutator
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type populateCurrentUser struct{}
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
)
|
||||
|
||||
type processInclude struct {
|
||||
|
|
|
@ -7,9 +7,9 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"fmt"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ import (
|
|||
"runtime"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"golang.org/x/exp/maps"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type selectEnvironment struct {
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
)
|
||||
|
||||
const bundleVarPrefix = "BUNDLE_VAR_"
|
||||
|
@ -48,7 +48,7 @@ func setVariable(v *variable.Variable, name string) error {
|
|||
|
||||
// We should have had a value to set for the variable at this point.
|
||||
// TODO: use cmdio to request values for unassigned variables if current
|
||||
// terminal is a tty. Tracked in https://github.com/databricks/bricks/issues/379
|
||||
// terminal is a tty. Tracked in https://github.com/databricks/cli/issues/379
|
||||
return fmt.Errorf(`no value assigned to required variable %s. Assignment can be done through the "--var" flag or by setting the %s environment variable`, name, bundleVarPrefix+name)
|
||||
}
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/notebook"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/notebook"
|
||||
"github.com/databricks/databricks-sdk-go/service/jobs"
|
||||
"github.com/databricks/databricks-sdk-go/service/pipelines"
|
||||
)
|
||||
|
|
|
@ -6,10 +6,10 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/databricks/databricks-sdk-go/service/jobs"
|
||||
"github.com/databricks/databricks-sdk-go/service/pipelines"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
@ -3,7 +3,7 @@ package config
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
)
|
||||
|
||||
// Resources defines Databricks resources associated with the bundle.
|
||||
|
|
|
@ -3,7 +3,7 @@ package config
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/ghodss/yaml"
|
||||
"github.com/imdario/mergo"
|
||||
)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/libs/databrickscfg"
|
||||
"github.com/databricks/cli/libs/databrickscfg"
|
||||
"github.com/databricks/databricks-sdk-go"
|
||||
"github.com/databricks/databricks-sdk-go/config"
|
||||
"github.com/databricks/databricks-sdk-go/service/iam"
|
||||
|
|
|
@ -3,7 +3,7 @@ package bundle
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/libs/errs"
|
||||
"github.com/databricks/cli/libs/errs"
|
||||
)
|
||||
|
||||
type DeferredMutator struct {
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/databricks-sdk-go/service/workspace"
|
||||
"github.com/fatih/color"
|
||||
)
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/sync"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/sync"
|
||||
)
|
||||
|
||||
func getSync(ctx context.Context, b *bundle.Bundle) (*sync.Sync, error) {
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
)
|
||||
|
||||
type upload struct{}
|
||||
|
|
|
@ -3,9 +3,9 @@ package lock
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/locker"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/locker"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
type acquire struct{}
|
||||
|
|
|
@ -3,8 +3,8 @@ package lock
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
type release struct{}
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/bricks/bundle/internal/tf/schema"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/internal/tf/schema"
|
||||
tfjson "github.com/hashicorp/terraform-json"
|
||||
)
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@ package terraform
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/databricks/databricks-sdk-go/service/compute"
|
||||
"github.com/databricks/databricks-sdk-go/service/jobs"
|
||||
"github.com/databricks/databricks-sdk-go/service/ml"
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/fatih/color"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
tfjson "github.com/hashicorp/terraform-json"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package terraform
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
// Dir returns the Terraform working directory for a given bundle.
|
||||
|
|
|
@ -8,9 +8,9 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
"github.com/hashicorp/go-version"
|
||||
"github.com/hashicorp/hc-install/product"
|
||||
"github.com/hashicorp/hc-install/releases"
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"os/exec"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/interpolation"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/interpolation"
|
||||
)
|
||||
|
||||
// Rewrite variable references to resources into Terraform compatible format.
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
tfjson "github.com/hashicorp/terraform-json"
|
||||
)
|
||||
|
@ -47,7 +47,7 @@ func (l *load) Apply(ctx context.Context, b *bundle.Bundle) ([]bundle.Mutator, e
|
|||
|
||||
func ValidateState(state *tfjson.State) error {
|
||||
if state.Values == nil {
|
||||
return fmt.Errorf("no deployment state. Did you forget to run 'bricks bundle deploy'?")
|
||||
return fmt.Errorf("no deployment state. Did you forget to run 'databricks bundle deploy'?")
|
||||
}
|
||||
|
||||
if state.Values.RootModule == nil {
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"os/exec"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
@ -37,5 +37,5 @@ func TestLoadWithNoState(t *testing.T) {
|
|||
Load(),
|
||||
})
|
||||
|
||||
require.ErrorContains(t, err, "Did you forget to run 'bricks bundle deploy'")
|
||||
require.ErrorContains(t, err, "Did you forget to run 'databricks bundle deploy'")
|
||||
}
|
||||
|
|
|
@ -5,9 +5,9 @@ import (
|
|||
"fmt"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/terraform"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/terraform"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
)
|
||||
|
||||
|
|
|
@ -6,9 +6,9 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/filer"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/filer"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
"github.com/databricks/databricks-sdk-go/apierr"
|
||||
)
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/filer"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/filer"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
type statePush struct{}
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
type write struct{}
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/libs/locker"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/libs/locker"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
"github.com/databricks/databricks-sdk-go"
|
||||
"github.com/hashicorp/terraform-exec/tfexec"
|
||||
)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
module github.com/databricks/bricks/bundle/internal/tf/codegen
|
||||
module github.com/databricks/cli/bundle/internal/tf/codegen
|
||||
|
||||
go 1.18
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"log"
|
||||
|
||||
"github.com/databricks/bricks/bundle/internal/tf/codegen/generator"
|
||||
"github.com/databricks/bricks/bundle/internal/tf/codegen/schema"
|
||||
"github.com/databricks/cli/bundle/internal/tf/codegen/generator"
|
||||
"github.com/databricks/cli/bundle/internal/tf/codegen/schema"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
@ -3,7 +3,7 @@ package bundle
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
// Mutator is the interface type that mutates a bundle's configuration or internal state.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package phases
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/artifacts"
|
||||
"github.com/databricks/bricks/bundle/config/interpolation"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/artifacts"
|
||||
"github.com/databricks/cli/bundle/config/interpolation"
|
||||
)
|
||||
|
||||
// The build phase builds artifacts.
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package phases
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/artifacts"
|
||||
"github.com/databricks/bricks/bundle/deploy/files"
|
||||
"github.com/databricks/bricks/bundle/deploy/lock"
|
||||
"github.com/databricks/bricks/bundle/deploy/terraform"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/artifacts"
|
||||
"github.com/databricks/cli/bundle/deploy/files"
|
||||
"github.com/databricks/cli/bundle/deploy/lock"
|
||||
"github.com/databricks/cli/bundle/deploy/terraform"
|
||||
)
|
||||
|
||||
// The deploy phase deploys artifacts and resources.
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package phases
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/deploy/files"
|
||||
"github.com/databricks/bricks/bundle/deploy/lock"
|
||||
"github.com/databricks/bricks/bundle/deploy/terraform"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/deploy/files"
|
||||
"github.com/databricks/cli/bundle/deploy/lock"
|
||||
"github.com/databricks/cli/bundle/deploy/terraform"
|
||||
)
|
||||
|
||||
// The destroy phase deletes artifacts and resources.
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package phases
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/interpolation"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/bricks/bundle/deploy/terraform"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/interpolation"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle/deploy/terraform"
|
||||
)
|
||||
|
||||
// The initialize phase fills in defaults and connects to the workspace.
|
||||
|
|
|
@ -4,8 +4,8 @@ package phases
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
)
|
||||
|
||||
// This phase type groups mutators that belong to a lifecycle phase.
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/folders"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/folders"
|
||||
)
|
||||
|
||||
const envBundleRoot = "BUNDLE_ROOT"
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
|
|
@ -6,12 +6,12 @@ import (
|
|||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/bricks/bundle/run/output"
|
||||
"github.com/databricks/bricks/bundle/run/progress"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/run/output"
|
||||
"github.com/databricks/cli/bundle/run/progress"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
"github.com/databricks/databricks-sdk-go/retries"
|
||||
"github.com/databricks/databricks-sdk-go/service/jobs"
|
||||
"github.com/fatih/color"
|
||||
|
|
|
@ -3,7 +3,7 @@ package run
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/cli/bundle"
|
||||
)
|
||||
|
||||
// RunnerLookup maps identifiers to a list of workloads that match that identifier.
|
||||
|
|
|
@ -3,9 +3,9 @@ package run
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
@ -6,12 +6,12 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/bricks/bundle/run/output"
|
||||
"github.com/databricks/bricks/bundle/run/progress"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/log"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle/run/output"
|
||||
"github.com/databricks/cli/bundle/run/progress"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/log"
|
||||
"github.com/databricks/databricks-sdk-go/service/pipelines"
|
||||
flag "github.com/spf13/pflag"
|
||||
)
|
||||
|
|
|
@ -43,7 +43,7 @@ func (event *ProgressEvent) IsInplaceSupported() bool {
|
|||
return false
|
||||
}
|
||||
|
||||
// TODO: Add inplace logging to pipelines. https://github.com/databricks/bricks/issues/280
|
||||
// TODO: Add inplace logging to pipelines. https://github.com/databricks/cli/issues/280
|
||||
type UpdateTracker struct {
|
||||
UpdateId string
|
||||
PipelineId string
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/run/output"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/run/output"
|
||||
)
|
||||
|
||||
type key string
|
||||
|
|
|
@ -3,9 +3,9 @@ package run
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/bricks/bundle/config/resources"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config/resources"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
@ -14,14 +14,14 @@ These descriptions are rendered in the inline documentation in an IDE
|
|||
### SOP: Add schema descriptions for new fields in bundle config
|
||||
|
||||
1. You can autogenerate empty descriptions for the new fields by running
|
||||
`bricks bundle schema --only-docs > ~/bricks/bundle/schema/docs/bundle_descriptions.json`
|
||||
`databricks bundle schema --only-docs > ~/databricks/bundle/schema/docs/bundle_descriptions.json`
|
||||
2. Manually edit bundle_descriptions.json to add your descriptions
|
||||
3. Build again to embed the new `bundle_descriptions.json` into the binary (`go build`)
|
||||
4. Again run `bricks bundle schema --only-docs > ~/bricks/bundle/schema/docs/bundle_descriptions.json` to copy over any applicable descriptions to `environments`
|
||||
4. Again run `databricks bundle schema --only-docs > ~/databricks/bundle/schema/docs/bundle_descriptions.json` to copy over any applicable descriptions to `environments`
|
||||
5. push to repo
|
||||
|
||||
|
||||
### SOP: Update descriptions in resources from a newer openapi spec
|
||||
|
||||
1. Run `bricks bundle schema --only-docs --openapi PATH_TO_SPEC > ~/bricks/bundle/schema/docs/bundle_descriptions.json`
|
||||
1. Run `databricks bundle schema --only-docs --openapi PATH_TO_SPEC > ~/databricks/bundle/schema/docs/bundle_descriptions.json`
|
||||
2. push to repo
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"os"
|
||||
"reflect"
|
||||
|
||||
"github.com/databricks/bricks/bundle/config"
|
||||
"github.com/databricks/cli/bundle/config"
|
||||
"github.com/databricks/databricks-sdk-go/openapi"
|
||||
)
|
||||
|
||||
|
|
|
@ -160,7 +160,7 @@ func (reader *OpenapiReader) jobsDocs() (*Docs, error) {
|
|||
}
|
||||
jobDocs := schemaToDocs(jobSettingsSchema)
|
||||
// TODO: add description for id if needed.
|
||||
// Tracked in https://github.com/databricks/bricks/issues/242
|
||||
// Tracked in https://github.com/databricks/cli/issues/242
|
||||
jobsDocs := &Docs{
|
||||
Description: "List of job definations",
|
||||
AdditionalProperties: jobDocs,
|
||||
|
@ -175,7 +175,7 @@ func (reader *OpenapiReader) pipelinesDocs() (*Docs, error) {
|
|||
}
|
||||
pipelineDocs := schemaToDocs(pipelineSpecSchema)
|
||||
// TODO: Two fields in resources.Pipeline have the json tag id. Clarify the
|
||||
// semantics and then add a description if needed. (https://github.com/databricks/bricks/issues/242)
|
||||
// semantics and then add a description if needed. (https://github.com/databricks/cli/issues/242)
|
||||
pipelinesDocs := &Docs{
|
||||
Description: "List of pipeline definations",
|
||||
AdditionalProperties: pipelineDocs,
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/interpolation"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/interpolation"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,10 +4,10 @@ import (
|
|||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/databricks/bricks/bundle"
|
||||
"github.com/databricks/bricks/bundle/config/interpolation"
|
||||
"github.com/databricks/bricks/bundle/config/mutator"
|
||||
"github.com/databricks/bricks/bundle/config/variable"
|
||||
"github.com/databricks/cli/bundle"
|
||||
"github.com/databricks/cli/bundle/config/interpolation"
|
||||
"github.com/databricks/cli/bundle/config/mutator"
|
||||
"github.com/databricks/cli/bundle/config/variable"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
package billable_usage
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/databricks-sdk-go/service/billing"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -5,9 +5,9 @@ package budgets
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/flags"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/flags"
|
||||
"github.com/databricks/databricks-sdk-go/service/billing"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -3,30 +3,30 @@
|
|||
package account
|
||||
|
||||
import (
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
billable_usage "github.com/databricks/bricks/cmd/account/billable-usage"
|
||||
budgets "github.com/databricks/bricks/cmd/account/budgets"
|
||||
credentials "github.com/databricks/bricks/cmd/account/credentials"
|
||||
custom_app_integration "github.com/databricks/bricks/cmd/account/custom-app-integration"
|
||||
encryption_keys "github.com/databricks/bricks/cmd/account/encryption-keys"
|
||||
account_groups "github.com/databricks/bricks/cmd/account/groups"
|
||||
account_ip_access_lists "github.com/databricks/bricks/cmd/account/ip-access-lists"
|
||||
log_delivery "github.com/databricks/bricks/cmd/account/log-delivery"
|
||||
account_metastore_assignments "github.com/databricks/bricks/cmd/account/metastore-assignments"
|
||||
account_metastores "github.com/databricks/bricks/cmd/account/metastores"
|
||||
networks "github.com/databricks/bricks/cmd/account/networks"
|
||||
o_auth_enrollment "github.com/databricks/bricks/cmd/account/o-auth-enrollment"
|
||||
private_access "github.com/databricks/bricks/cmd/account/private-access"
|
||||
published_app_integration "github.com/databricks/bricks/cmd/account/published-app-integration"
|
||||
account_service_principals "github.com/databricks/bricks/cmd/account/service-principals"
|
||||
storage "github.com/databricks/bricks/cmd/account/storage"
|
||||
account_storage_credentials "github.com/databricks/bricks/cmd/account/storage-credentials"
|
||||
account_users "github.com/databricks/bricks/cmd/account/users"
|
||||
vpc_endpoints "github.com/databricks/bricks/cmd/account/vpc-endpoints"
|
||||
workspace_assignment "github.com/databricks/bricks/cmd/account/workspace-assignment"
|
||||
workspaces "github.com/databricks/bricks/cmd/account/workspaces"
|
||||
billable_usage "github.com/databricks/cli/cmd/account/billable-usage"
|
||||
budgets "github.com/databricks/cli/cmd/account/budgets"
|
||||
credentials "github.com/databricks/cli/cmd/account/credentials"
|
||||
custom_app_integration "github.com/databricks/cli/cmd/account/custom-app-integration"
|
||||
encryption_keys "github.com/databricks/cli/cmd/account/encryption-keys"
|
||||
account_groups "github.com/databricks/cli/cmd/account/groups"
|
||||
account_ip_access_lists "github.com/databricks/cli/cmd/account/ip-access-lists"
|
||||
log_delivery "github.com/databricks/cli/cmd/account/log-delivery"
|
||||
account_metastore_assignments "github.com/databricks/cli/cmd/account/metastore-assignments"
|
||||
account_metastores "github.com/databricks/cli/cmd/account/metastores"
|
||||
networks "github.com/databricks/cli/cmd/account/networks"
|
||||
o_auth_enrollment "github.com/databricks/cli/cmd/account/o-auth-enrollment"
|
||||
private_access "github.com/databricks/cli/cmd/account/private-access"
|
||||
published_app_integration "github.com/databricks/cli/cmd/account/published-app-integration"
|
||||
account_service_principals "github.com/databricks/cli/cmd/account/service-principals"
|
||||
storage "github.com/databricks/cli/cmd/account/storage"
|
||||
account_storage_credentials "github.com/databricks/cli/cmd/account/storage-credentials"
|
||||
account_users "github.com/databricks/cli/cmd/account/users"
|
||||
vpc_endpoints "github.com/databricks/cli/cmd/account/vpc-endpoints"
|
||||
workspace_assignment "github.com/databricks/cli/cmd/account/workspace-assignment"
|
||||
workspaces "github.com/databricks/cli/cmd/account/workspaces"
|
||||
)
|
||||
|
||||
var accountCmd = &cobra.Command{
|
||||
|
|
|
@ -5,9 +5,9 @@ package credentials
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/flags"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/flags"
|
||||
"github.com/databricks/databricks-sdk-go/service/provisioning"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package credentials
|
||||
|
||||
import "github.com/databricks/bricks/libs/cmdio"
|
||||
import "github.com/databricks/cli/libs/cmdio"
|
||||
|
||||
func init() {
|
||||
listCmd.Annotations["template"] = cmdio.Heredoc(`
|
||||
|
|
|
@ -5,9 +5,9 @@ package custom_app_integration
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/flags"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/flags"
|
||||
"github.com/databricks/databricks-sdk-go/service/oauth2"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -5,9 +5,9 @@ package encryption_keys
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/databricks/bricks/cmd/root"
|
||||
"github.com/databricks/bricks/libs/cmdio"
|
||||
"github.com/databricks/bricks/libs/flags"
|
||||
"github.com/databricks/cli/cmd/root"
|
||||
"github.com/databricks/cli/libs/cmdio"
|
||||
"github.com/databricks/cli/libs/flags"
|
||||
"github.com/databricks/databricks-sdk-go/service/provisioning"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package encryption_keys
|
||||
|
||||
import "github.com/databricks/bricks/libs/cmdio"
|
||||
import "github.com/databricks/cli/libs/cmdio"
|
||||
|
||||
func init() {
|
||||
listCmd.Annotations["template"] = cmdio.Heredoc(`
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue