Merge pull request #1023 from Shocktrooper/FixRegistryEnable

Adding registry enablement fixes

Author: timofurrer

.gitignore

@@ -30,3 +30,5 @@ website/build
 website/node_modules
 website/vendor
 /tmp
+certs/gitlab-registry.crt
+certs/gitlab-registry.key

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to GitLab Terraform Provider
 
-Thank you for contributing to this provider! :tada: :heart: :trophy: 
+Thank you for contributing to this provider! :tada: :heart: :trophy:
 
 Generally we accept any change that adds or changes a Terraform resource that is in line with the [GitLab API](https://docs.gitlab.com/ee/api/api_resources.html). It is always best to [open an issue](https://github.com/gitlabhq/terraform-provider-gitlab/issues/new/choose) before starting on a change.
 
@@ -77,16 +77,15 @@ You'll first need [Go](http://www.golang.org) installed on your machine (version
    $ make build
    ```
 
-   
+
 ### Use a Remote Environment via GitPod
 
-You can choose to use your own development environment if desired, however a `.gitpod.yml` file is included within the repository to allow the use of [GitPod](https://gitpod.io/) easily. 
-This will allow you to use GitPod's integration with GitHub to quickly start a web-based development environment including Go and Docker, which are necessary 
-for running tests. To use GitPod's integration, you have two different options described below. After you've completed one of the two options, your development environment 
-will be ready within a minute or two. As part of starting up, your development environment will automatically start up the `gitlab-ce` container necessary for running 
+You can choose to use your own development environment if desired, however a `.gitpod.yml` file is included within the repository to allow the use of [GitPod](https://gitpod.io/) easily.
+This will allow you to use GitPod's integration with GitHub to quickly start a web-based development environment including Go and Docker, which are necessary
+for running tests. To use GitPod's integration, you have two different options described below. After you've completed one of the two options, your development environment
+will be ready within a minute or two. As part of starting up, your development environment will automatically start up the `gitlab-ce` container necessary for running
 tests, as described in the "Running Tests/Option 1" section below.
 
-
 #### Option 1: Manually navigate to GitPod
 
 You can manually sign in and open your workspace within GitPod by following these steps:
@@ -113,6 +112,8 @@ The acceptance tests can run against a Gitlab instance where you have a token wi
 
 This option is the easiest and requires [docker-compose](https://docs.docker.com/compose/install/) (version 1.13+) to be installed on your machine.
 
+Note that the you need an up-to-date version of GNU make and an up-to-date version of openssl / libressl.
+
 1. Start the Gitlab container. It will take about 5 minutes for the container to become healthy.
 
   ```sh

GNUmakefile

@@ -65,16 +65,20 @@ SERVICE ?= gitlab-ce
 GITLAB_TOKEN ?= ACCTEST1234567890123
 GITLAB_BASE_URL ?= http://127.0.0.1:8080/api/v4
 
-testacc-up: ## Launch a GitLab instance.
+testacc-up: | certs ## Launch a GitLab instance.
 	docker-compose up -d $(SERVICE)
 	./scripts/await-healthy.sh
 
 testacc-down: ## Teardown a GitLab instance.
-	docker-compose down
+	docker-compose down --volumes
 
 testacc: ## Run acceptance tests against a GitLab instance.
 	TF_ACC=1 GITLAB_TOKEN=$(GITLAB_TOKEN) GITLAB_BASE_URL=$(GITLAB_BASE_URL) go test -v $(PROVIDER_SRC_DIR) $(TESTARGS) -timeout 40m
 
+certs: ## Generate certs for the GitLab container registry
+	mkdir -p certs
+	openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout certs/gitlab-registry.key -out certs/gitlab-registry.crt -subj "/CN=gitlab-registry.com" -addext "subjectAltName=DNS:IP:127.0.0.1"
+
 # TOOLS
 # Tool dependencies are installed into a project-local /bin folder.
 
@@ -104,3 +108,6 @@ TERRAFORM_VERSION = v1.1.4
 tool-terraform:
 	@# See https://github.com/hashicorp/terraform/issues/30356
 	@[ -f $(GOBIN)/terraform ] || { mkdir -p tmp; cd tmp; rm -rf terraform; git clone --branch $(TERRAFORM_VERSION) --depth 1 https://github.com/hashicorp/terraform.git; cd terraform; GOBIN=$(GOBIN) go install; cd ..; rm -rf terraform; }
+
+clean: testacc-down
+	@rm -rf certs/

docker-compose.yml

@@ -17,6 +17,8 @@ services:
       - logs-ce:/var/log/gitlab
       - data-ce:/var/opt/gitlab
       - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh:Z
+      - ${PWD}/scripts/gitlab.rb:/etc/gitlab/gitlab.rb:ro
+      - ${PWD}/certs:/etc/gitlab/ssl:ro
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s
@@ -38,6 +40,8 @@ services:
       - data-ee:/var/opt/gitlab
       - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh:Z
       - ${PWD}/Gitlab-license.txt:/Gitlab-license.txt:Z
+      - ${PWD}/scripts/gitlab.rb:/etc/gitlab/gitlab.rb:ro
+      - ${PWD}/certs:/etc/gitlab/ssl:ro
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s

scripts/gitlab.rb

@@ -0,0 +1,4 @@
+registry_external_url 'http://127.0.0.1:5050'
+registry['enable']                    = true
+registry_nginx['ssl_certificate']     = "/etc/gitlab/ssl/gitlab-registry.pem"
+registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab-registry.key"

scripts/healthcheck-and-setup.sh

@@ -28,11 +28,6 @@ test -f $done || {
     printf 'terraform_token.save!;'
   ) | gitlab-rails console
 
-  echo "Enabling the container registry for the instance so that Personal Access Tokens can be created with the read_registry and write_registry scopes"
-  (
-    printf 'Gitlab.config.registry["enabled"] = true'
-  ) | gitlab-rails console
-
   # 2020-09-07: Currently Gitlab (version 13.3.6 ) doesn't allow in admin API
   # ability to set a group as instance level templates.
   # To test resource_gitlab_project_test template features we add