IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

command/push: properly copy the data directory no matter what

Browse Source
This commit is contained in:
Mitchell Hashimoto 2015-03-05 23:10:28 -08:00
parent 22087181af
commit a1b424d53f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/push.go
View File

@ -95,8 +95,10 @@ func (c *PushCommand) Run(args []string) int {
// Build the archiving options, which includes everything it can // Build the archiving options, which includes everything it can
// by default according to VCS rules but forcing the data directory. // by default according to VCS rules but forcing the data directory.
archiveOpts := &archive.ArchiveOpts{ archiveOpts := &archive.ArchiveOpts{
Include: []string{filepath.Join(c.DataDir())}, VCS: true,
VCS: true, Extra: map[string]string{
DefaultDataDir: c.DataDir(),
},
} }
if !moduleLock { if !moduleLock {
// If we're not locking modules, then exclude the modules dir. // If we're not locking modules, then exclude the modules dir.

6
command/push_test.go
View File

@ -50,7 +50,11 @@ func TestPush_good(t *testing.T) {
} }
actual := testArchiveStr(t, archivePath) actual := testArchiveStr(t, archivePath)
expected := []string{} expected := []string{
".terraform/",
".terraform/terraform.tfstate",
"main.tf",
}
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual) t.Fatalf("bad: %#v", actual)
} }