jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

getmodules: NewPackageFetcher now expects an "environment" argument

Browse Source 
This continues our work to follow the dependency inversion style for the
"package fetcher" component of the module installer.

Mimicking the existing pattern for providers, package main is now
responsible for instantiating the PackageFetcher and providing it to
the "command" package as a field of command.Meta.

We could potentially go further here and follow dependency inversion style
for _all_ of the special clients needed by the various go-getter getters,
but our primary concern for now is preparing to add a new "getter" for
installation from an OCI Distribution repository, and so we'll leave the
other already-working code unchanged to reduce the risk of this initial
work.

Future commits will actually wire in the implementation details for OCI
Repository access. This commit focuses only on plumbing the necessary
objects through the API layers.

Signed-off-by: Martin Atkins <mart@degeneration.co.uk>
This commit is contained in:
Martin Atkins
2025-04-14 12:04:25 -07:00
parent 6ab72535e9
commit af80d429ab
12 changed files with 216 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/command/init_test.go
View File

@@ -18,16 +18,16 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/go-version"
"github.com/mitchellh/cli"
"github.com/zclconf/go-cty/cty"
"github.com/hashicorp/go-version"
"github.com/opentofu/opentofu/internal/addrs"
"github.com/opentofu/opentofu/internal/configs"
"github.com/opentofu/opentofu/internal/configs/configschema"
"github.com/opentofu/opentofu/internal/depsfile"
"github.com/opentofu/opentofu/internal/encryption"
"github.com/opentofu/opentofu/internal/getmodules"
"github.com/opentofu/opentofu/internal/getproviders"
"github.com/opentofu/opentofu/internal/providercache"
"github.com/opentofu/opentofu/internal/states"
@@ -95,6 +95,12 @@ func TestInit_fromModule_cwdDest(t *testing.T) {
testingOverrides: metaOverridesForProvider(testProvider()),
Ui: ui,
View: view,
// This test relies on the module installer's legacy support for
// treating an absolute filesystem path as if it were a "remote"
// source address, and so we need a real package fetcher but the
// way we use it here does not cause it to make network requests.
ModulePackageFetcher: getmodules.NewPackageFetcher(nil),
},
}
@@ -102,7 +108,7 @@ func TestInit_fromModule_cwdDest(t *testing.T) {
"-from-module=" + testFixturePath("init"),
}
if code := c.Run(args); code != 0 {
t.Fatalf("bad: \n%s", ui.ErrorWriter.String())
t.Fatalf("unexpected error\n%s", ui.ErrorWriter.String())
}
if _, err := os.Stat(filepath.Join(td, "hello.tf")); err != nil {
@@ -146,6 +152,12 @@ func TestInit_fromModule_dstInSrc(t *testing.T) {
testingOverrides: metaOverridesForProvider(testProvider()),
Ui: ui,
View: view,
// This test relies on the module installer's legacy support for
// treating an absolute filesystem path as if it were a "remote"
// source address, and so we need a real package fetcher but the
// way we use it here does not cause it to make network requests.
ModulePackageFetcher: getmodules.NewPackageFetcher(nil),
},
}
@@ -1837,6 +1849,14 @@ func TestInit_cancelModules(t *testing.T) {
Ui: ui,
View: view,
ShutdownCh: shutdownCh,
// This test needs a real module package fetcher instance because
// its configuration includes a reference to a module from a registry
// that doesn't really exist. The shutdown signal prevents us from
// actually making a request to this, but we still need to provide
// the fetcher so that it will _attempt_ to make a network request
// that can then fail with a cancellation error.
ModulePackageFetcher: getmodules.NewPackageFetcher(nil),
}
c := &InitCommand{