Commit c28b940

authored

fix: Skip broken symlinks on hash computing (terraform-aws-modules#639)

1 parent 00a7172 commit c28b940Copy full SHA for c28b940

File tree

+19

-7

lines changed

+19

-7

lines changed

Lines changed: 19 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -272,12 +272,16 @@ def update_hash(hash_obj, file_root, file_path):`
`272`	`272`	`relative_path = os.path.join(file_root, file_path)`
`273`	`273`	`hash_obj.update(relative_path.encode())`
`274`	`274`
`275`		`- with open(relative_path, "rb") as open_file:`
`276`		`- while True:`
`277`		`- data = open_file.read(1024 * 8)`
`278`		`- if not data:`
`279`		`- break`
`280`		`- hash_obj.update(data)`
	`275`	`+ try:`
	`276`	`+ with open(relative_path, "rb") as open_file:`
	`277`	`+ while True:`
	`278`	`+ data = open_file.read(1024 * 8)`
	`279`	`+ if not data:`
	`280`	`+ break`
	`281`	`+ hash_obj.update(data)`
	`282`	+ # ignore broken symlinks content to don't fail on `terraform destroy` command
	`283`	`+ except FileNotFoundError:`
	`284`	`+ pass`
`281`	`285`
`282`	`286`
`283`	`287`	`class ZipWriteStream:`
`@@ -939,7 +943,15 @@ def execute(self, build_plan, zip_stream, query):`
`939`	`943`	`with tempfile.NamedTemporaryFile(mode="w+t", delete=True) as temp_file:`
`940`	`944`	`path, script = action[1:]`
`941`	`945`	# NOTE: Execute `pwd` to determine the subprocess shell's working directory after having executed all other commands.
`942`		`- script = f"{script} && pwd >{temp_file.name}"`
	`946`	`+ script = "\n".join(`
	`947`	`+ (`
	`948`	`+ script,`
	`949`	`+ "retcode=$?",`
	`950`	`+ f"pwd >{temp_file.name}",`
	`951`	`+ "exit $retcode",`
	`952`	`+ )`
	`953`	`+ )`
	`954`	`+`
`943`	`955`	`p = subprocess.Popen(`
`944`	`956`	`script,`
`945`	`957`	`shell=True,`

Comments

(0)