Merge pull request #310 from terraform-google-modules/ludo-v4.1.0

Update changelog for v5.0.0, add migration doc for fabric-project

Author: aaron-lane

CHANGELOG.md

@@ -8,6 +8,15 @@ Extending the adopted spec, each change should have a link to its corresponding
 
 ## [Unreleased]
 
+## [5.0.0] - 2019-11-04
+
+5.0.0 is a backwards incompatible release for `modules/fabric-project`. See the [upgrade guide](./docs/upgrading_to_fabric_project_v5.0.md) for details.
+
+### Fixed
+
+- Manage service activation in `modules/fabric-project` with a resource instead of relying on `modules/project-services`, so that output dependency on services works again. Fixes [#308]. [#309]
+
+
 ## [4.0.1] - 2019-10-30
 
 ### Fixed
@@ -217,7 +226,8 @@ Extending the adopted spec, each change should have a link to its corresponding
 ### ADDED
 - This is the initial release of the Project Factory Module.
 
-[Unreleased]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v4.0.1...HEAD
+[Unreleased]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v5.0.0...HEAD
+[5.0.0]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v4.0.1...v5.0.0
 [4.0.1]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v3.3.1...v4.0.0
 [3.3.1]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v3.3.0...v3.3.1
@@ -247,6 +257,8 @@ Extending the adopted spec, each change should have a link to its corresponding
 [0.2.1]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v0.1.0...v0.2.0
 
+[#309]: https://github.com/terraform-google-modules/terraform-google-project-factory/pull/309
+[#308]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/308
 [#303]: https://github.com/terraform-google-modules/terraform-google-project-factory/pull/303
 [#288]: https://github.com/terraform-google-modules/terraform-google-project-factory/pull/288
 [#282]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/282

docs/upgrading_to_fabric_project_v5.0.md

@@ -0,0 +1,47 @@
+# Upgrading to the Fabric Project module v5.0
+
+**This document only applies to the `fabric-project` module. If you use the main module or other submodules, you can stop reading now.**
+
+The v5.0 release of the `fabric-project` module is a backwards incompatible release, changing how Google Project Services (APIs) are managed.
+
+## Migration instructions
+
+First, ensure there are no pending changes to infrastructure by applying existing code.
+
+```shell
+terraform apply
+```
+
+Backup Terraform state for safety.
+
+```shell
+terraform state pull >terraform-state.json
+```
+
+Update the `fabric-project` version to 5.0.0, run `terraform init`, then identify project service resources to move.
+
+```shell
+tf state list |grep module.project_services.google_project_service | sed 's/\[.*$//' |uniq
+```
+
+The command will output a list of resources which will need to be moved in Terraform state:
+
+```
+module.audit-project.module.project_services.google_project_service.project_services
+module.service-project.module.project_services.google_project_service.project_services
+```
+
+For each of the above resources, issue a `terraform state mv` command, where the destination resource omits `module.project_services`. Using the example above:
+
+```shell
+terraform state mv \
+  module.audit-project.module.project_services.google_project_service.project_services \
+  module.audit-project.google_project_service.project_services
+terraform state mv \
+  module.service-project.module.project_services.google_project_service.project_services \
+  module.service-project.google_project_service.project_services
+```
+
+Once done, test that `terraform plan` won't create or destroy any `google_project_service` resource, then delete the `terraform-state.json` file you saved earlier.
+
+In case of issues, revert the module version, run `terraform init`, then revert to the known working Terraform state version with `terraform state push terraform-state.json`.