Skip to content

Fix terraform extract #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpogran merged 11 commits into from
May 9, 2022
Merged

Fix terraform extract #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
678377b
fix: make visible the path being extracted
cpc-camarj Apr 27, 2022
135469c
fix: output files in download path
cpc-camarj Apr 27, 2022
eb0d7e6
fix: output files in download path
cpc-camarj Apr 27, 2022
3ea2f56
fix: ensure using defined variable
cpc-camarj Apr 27, 2022
e5e4b20
fix: see if adding the extension fixes the problem
cpc-camarj Apr 27, 2022
62f1448
fix: switch to check messages to debug
cpc-camarj Apr 27, 2022
07c30f5
fix: only change file extension of we are on Windows
cpc-camarj Apr 27, 2022
155af15
fix: use a mutable variable for setting the CLI path
cpc-camarj Apr 28, 2022
50cae47
style: fix semistandard lint errors
cpc-camarj Apr 28, 2022
1a3ca02
fix: move extraction debug statement to more sensible location
cpc-camarj Apr 29, 2022
aff1a4e
test: mock function changing the filesystem
cpc-camarj Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,19 @@ async function downloadCLI (url) {
core.debug(`Downloading Terraform CLI from ${url}`);
const pathToCLIZip = await tc.downloadTool(url);

let pathToCLI = '';

core.debug('Extracting Terraform CLI zip file');
const pathToCLI = await tc.extractZip(pathToCLIZip);
if (os.platform().startsWith('win')) {
core.debug(`Terraform CLI Download Path is ${pathToCLIZip}`);
const fixedPathToCLIZip = `${pathToCLIZip}.zip`;
io.mv(pathToCLIZip, fixedPathToCLIZip);
core.debug(`Moved download to ${fixedPathToCLIZip}`);
pathToCLI = await tc.extractZip(fixedPathToCLIZip);
} else {
pathToCLI = await tc.extractZip(pathToCLIZip);
}

core.debug(`Terraform CLI path is ${pathToCLI}.`);

if (!pathToCLIZip || !pathToCLI) {
Expand Down
13 changes: 12 additions & 1 deletion lib/setup-terraform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,19 @@ async function downloadCLI (url) {
core.debug(`Downloading Terraform CLI from ${url}`);
const pathToCLIZip = await tc.downloadTool(url);

let pathToCLI = '';

core.debug('Extracting Terraform CLI zip file');
const pathToCLI = await tc.extractZip(pathToCLIZip);
if (os.platform().startsWith('win')) {
core.debug(`Terraform CLI Download Path is ${pathToCLIZip}`);
const fixedPathToCLIZip = `${pathToCLIZip}.zip`;
io.mv(pathToCLIZip, fixedPathToCLIZip);
core.debug(`Moved download to ${fixedPathToCLIZip}`);
pathToCLI = await tc.extractZip(fixedPathToCLIZip);
} else {
pathToCLI = await tc.extractZip(pathToCLIZip);
}

core.debug(`Terraform CLI path is ${pathToCLI}.`);

if (!pathToCLIZip || !pathToCLI) {
Expand Down
2 changes: 2 additions & 0 deletions test/setup-terraform.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ describe('Setup Terraform', () => {
.fn()
.mockReturnValueOnce('file.zip');

io.mv = jest.fn();

tc.extractZip = jest
.fn()
.mockReturnValueOnce('file');
Expand Down