Merge pull request #80 from kang2453/master

docs: Add Docker Hub and AWS ECR settings to README.md, and modify GC…

Author: kang2453

README.md

@@ -10,30 +10,59 @@ SpaceONE Repository Service
 
 # Configuration
 
-## FOR AWS ECR User
 
+
+
+## Docker Hub Setup ( Docker Hub )
+~~~
+CONNECTORS:
+	DockerHubConnector:
+		registry_url:"<registry_url>"
+
+REGISTRY_INFO:
+	DOCKER_HUB:
+		url: registry.hub.docker.com
+DEFAULT_REGISTRY: "DOCKER_HUB"
 ~~~
-CONNECTOR:
-	RegistryConnector:
-		host: https://<account_id>.dkr.ecr.<region_name>.amazonaws.com
-		verify_ssl: False
-		username: AWS
-		api_version: 2
-
-## GCP artifact repository added
-CONNECTOR:
-	RegistryConnector:
-		host: https://<account_id>.dkr.ecr.<region_name>.amazonaws.com
-		verify_ssl: False
-		username: AWS
-		api_version: 2
+
+## AWS Setup (ECR)
+~~~
+CONNECTORS:
+	AWSPrivateECRConnector:
+		aws_access_key_id: "<AWS_ACCESS_KEY_ID>"
+		aws_secret_access_key: "<AWS_SECRET_ACCESS_KEY>"
+		region_name: "<ap-northeast-2>"
+		account_id: "<123456789012>"
+
+REGISTRY_INFO:
+	AWS_PRIVATE_ECR:
+		url: "<account_id>.dkr.ecr.<region>.amazonaws.com"
+
+DEFAULT_REGISTRY: "AWS_PRIVATE_ECR"
+~~~
+
+- Example url: `123456789012.dkr.ecr.ap-northeast-2.amazonaws.com`
+- If you set `DEFAULT_REGISTRY` to `AWS_PRIVATE_ECR`, plugin images are pulled from ECR.
+
+
+## GCP Setup (Artifact Registry)
+
+Prepare a service account key (JSON) and use its Base64-encoded string.
+
+~~~
+CONNECTORS:
 	GCPPrivateGCRConnector:
-		project_id: project id
-      	repository_id: gcp's artifact registry id
-      	location: 
-      	service_account_key: service account key base64 encode 
+		project_id: "<my-project-id>"  # Optional; inferred from the service account key when omitted
+		repository_id: "<artifact-registry-repo-id>"
+		location: "<artifact-registry-repo-location>"
+		service_account_key: "<BASE64_ENCODED_SERVICE_ACCOUNT_JSON>"
 
 REGISTRY_INFO:
 	GCP_PRIVATE_GCR:
-		url: <location>-docker.pkg.dev/<project_id>/<repository_id>
+		url: "<location>-docker.pkg.dev/<project_id>/<repository_id>"
+
+DEFAULT_REGISTRY: "GCP_PRIVATE_GCR"
 ~~~
+
+- Example url: `asia-northeast3-docker.pkg.dev/my-project/gcr-repository`
+- If you set `DEFAULT_REGISTRY` to `GCP_PRIVATE_GCR`, plugin images are pulled from Artifact Registry.

src/spaceone/repository/connector/registry_connector.py

@@ -158,8 +158,8 @@ def __init__(self, *args, **kwargs):
 
         # 서비스 계정 키 JSON 사용
         try:
-            self.repository_id = self.config.get("repository_id", "space-cloudops")
-            self.location = self.config.get("location", "asia-northeast3")
+            self.repository_id = self.config.get("repository_id")
+            self.location = self.config.get("location")
 
             service_account_key = self.config.get("service_account_key")
             decoded_key = base64.b64decode(service_account_key).decode('utf-8')