Accepting request 1173450 from home:ojkastl_buildservice:Branch_terraform

update to 0.58.4 (refactor packaging, due to upstream changes

OBS-URL: https://build.opensuse.org/request/show/1173450
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:terraform/terragrunt?expand=0&rev=258

Makefile

@@ -0,0 +1,36 @@
+NAME = terragrunt
+
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+mkfile_dir := $(dir $(mkfile_path))
+export GOPATH := $(mkfile_dir)/tmpdir/
+
+# make sure ./ is in the path,
+# otherwise mockery is not found...
+export PATH := :$(mkfile_dir)/tmpdir/bin:$(PATH)
+
+default: clean tar
+
+clean:
+	rm -rf $(NAME) $(NAME)-*.obscpio vendor.tar.gz ./tmpdir
+
+tar:
+	osc service manualrun
+	mkdir -p ./tmpdir/src/ && \
+	rm -rf ./tmpdir/src/  && \
+	echo "Copy files to ./tmpdir/src/" && \
+	cp -r ./terragrunt/ ./tmpdir/src && \
+	cd ./tmpdir/src/ && \
+	echo "Installing mockery" && \
+	go install github.com/vektra/mockery/v2@v2.43.0 && \
+	echo "Starting go generate" && \
+	go generate ./... && \
+	go mod download && \
+	go mod vendor && \
+	echo "Creating tarball vendor.tar.gz" && \
+	tar czf ../../vendor.tar.gz ./vendor && \
+	ls -lh ../../vendor.tar.gz && \
+	echo "Cleaning up" && \
+	go clean -modcache && \
+	cd ../../ && \
+	rm -rf ./tmpdir && \
+	echo "Finished"

PACKAGING_README.md

@@ -0,0 +1,14 @@
+# Packaging terragrunt
+
+terragrunt 0.58.4 changed the Makefile. Since then, the `mocks` need to be
+prepared during build.
+This also means, that vendoring fails without first creating the mocks...
+
+1. Change the version in the `_service` file
+3. Run `make`
+4. Create a changelog entry
+5. Commit the changes as usual
+
+For the OBS workflow you need `obs-service-tar_scm`.
+
+For the `make` part you need `make` and a recent go installation.

_service

@@ -3,7 +3,7 @@
     <param name="url">https://github.com/gruntwork-io/terragrunt</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v0.58.2</param>
+    <param name="revision">v0.58.4</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
@@ -16,6 +16,4 @@
     <param name="file">*.tar</param>
     <param name="compression">gz</param>
   </service>
-  <service name="go_modules" mode="manual">
-  </service>
 </services>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/gruntwork-io/terragrunt</param>
-              <param name="changesrevision">013f281e7c79360ca92bd90f9f239d172fe751d0</param></service></servicedata>
+              <param name="changesrevision">ee1ece03d9b774e1fb1c76ccebc8b2444a0fcd44</param></service></servicedata>

terragrunt-0.58.2.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aac58600f9b45a45eb1af09c546566519458e9aa93d6a6480dbc5130cde1c6ca
-size 7512077

terragrunt-0.58.4.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ad03923b5458563be94988b42a61eb0625670f09da64efeb60b8f5334a3027d
+size 7527437

terragrunt.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat May 11 19:49:23 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- add Makefile and PACKAGING_README.md, remove services from
+  `_service`. Upstream changes break the go module vendoring, so we
+  can no longer use the go_modules service
+
+-------------------------------------------------------------------
+Fri May 10 20:41:19 UTC 2024 - opensuse_buildservice@ojkastl.de
+
+- Update to version 0.58.4:
+  * Updated makefile to generate mocks before build (#3126)
+  * Usage of locks when copy metadata fields (#3124)
+
+-------------------------------------------------------------------
+Wed May 08 10:30:27 UTC 2024 - opensuse_buildservice@ojkastl.de
+
+- Update to version 0.58.3:
+  * Added Terraform lock file generation with provider caching (#3108)
+
 -------------------------------------------------------------------
 Fri May 03 16:15:59 UTC 2024 - opensuse_buildservice@ojkastl.de
 

terragrunt.obsinfo

@@ -1,4 +1,4 @@
 name: terragrunt
-version: 0.58.2
+version: 0.58.4
-mtime: 1714670610
+mtime: 1715370548
-commit: 013f281e7c79360ca92bd90f9f239d172fe751d0
+commit: ee1ece03d9b774e1fb1c76ccebc8b2444a0fcd44

terragrunt.spec

@@ -19,13 +19,15 @@
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
 
 Name:           terragrunt
-Version:        0.58.2
+Version:        0.58.4
 Release:        0
 Summary:        Thin wrapper for Terraform for working with multiple Terraform modules
 License:        MIT
 URL:            https://github.com/gruntwork-io/terragrunt
 Source:         terragrunt-%{version}.tar.gz
 Source1:        vendor.tar.gz
+Source2:        Makefile
+Source3:        PACKAGING_README.md
 BuildRequires:  go1.21 >= 1.21.7
 
 %description
@@ -38,7 +40,7 @@ Terragrunt is a thin wrapper for Terraform that provides extra tools for keeping
 go build \
    -mod=vendor \
    -buildmode=pie \
-   -ldflags="-X main.VERSION=%{version}"
+   -ldflags="-X github.com/gruntwork-io/go-commons/version.Version=v%{version}"
 
 %install
 # Install the binary.

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af0d6c543358223ebc0f94ab71dce792b0c038d97fe6820a0269d44cd4a9349e
+oid sha256:9daca99f213ee5e8515e634d8127f60446e134e7b2d1c73cd7dc7afe4b02397e
-size 15356253
+size 16001898