Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cdn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This plugin provisions a complete CDN solution using Google Cloud CDN with:
```yaml
entrypoints:
default:
plugin: "gcp-cdn"
plugin: "cdn"
properties:
project_id: "my-project-123"
region: "us-central1"
Expand Down
6 changes: 1 addition & 5 deletions cdn/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: gcp-cdn
name: cdn
display_name: CDN
type: entrypoint
description: "Creates Cloud CDN with load balancing and SSL certificates"
Expand All @@ -16,10 +16,6 @@ inputs:
type: string
required: true
description: "Google Cloud region (e.g. `us-central1`)"
cdn_domain:
type: object
required: true
description: 'CDN domain configuration (e.g. `{"name": "cdn.example.com", "ssl": true}`)'
domain_name:
type: string
required: true
Expand Down
6 changes: 3 additions & 3 deletions cloudrun/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ This plugin provisions Cloud Run services with:
## Prerequisites

- Container image pushed to Google Container Registry or Artifact Registry
- Service account with appropriate IAM permissions (managed by `gcp-service-account` plugin)
- Service account with appropriate IAM permissions (managed by `service-account` plugin)

## Usage Example

Expand All @@ -47,9 +47,9 @@ This plugin provisions Cloud Run services with:
```yaml
services:
api:
plugin: "gcp-cloudrun"
plugin: "cloudrun"
identities:
- plugin: "gcp-service-account"
- plugin: "service-account"
properties:
project_id: "my-project-123"
region: "us-central1"
Expand Down
4 changes: 2 additions & 2 deletions cloudrun/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: gcp-cloudrun
name: cloudrun
display_name: Cloud Run
type: service
description: "Deploys Cloud Run services with auto-scaling and service accounts"
Expand All @@ -9,7 +9,7 @@ deployment:
# NOTE: // is required to reference a sub-path of repository for terraform modules
terraform: ./module
runtime:
go_module: github.com/nitrictech/plugins/gcp/cloudrun
go_module: github.com/nitrictech/plugins-gcp/cloudrun

inputs:
environment_variables:
Expand Down
4 changes: 2 additions & 2 deletions cloudrun/module/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ resource "google_cloud_run_v2_service" "service" {
}
env {
name = "SERVICE_ACCOUNT_EMAIL"
value = var.suga.identities["gcp:iam:role"].exports["gcp_service_account:email"]
value = var.suga.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]
}
env {
name = "GCP_REGION"
Expand All @@ -143,7 +143,7 @@ resource "google_cloud_run_v2_service" "service" {
}
}

service_account = var.suga.identities["gcp:iam:role"].exports["gcp_service_account:email"]
service_account = var.suga.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]
timeout = "${var.timeout_seconds}s"
}

Expand Down
2 changes: 1 addition & 1 deletion cloudrun/module/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {

docker = {
source = "kreuzwerker/docker"
version = "3.6.2"
version = "3.6.0"
}
}
}
12 changes: 6 additions & 6 deletions serviceaccount/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ This plugin provisions IAM service accounts with:
```yaml
services:
storage-worker:
plugin: "gcp-cloudrun"
plugin: "cloudrun"
identities:
- plugin: "gcp-service-account"
- plugin: "service-account"
properties:
project_id: "my-project-123"
trusted_actions:
Expand All @@ -54,9 +54,9 @@ services:
```yaml
services:
backend:
plugin: "gcp-cloudrun"
plugin: "cloudrun"
identities:
- plugin: "gcp-service-account"
- plugin: "service-account"
properties:
project_id: "my-project-123"
trusted_actions:
Expand All @@ -70,9 +70,9 @@ services:
```yaml
services:
monitoring:
plugin: "gcp-cloudrun"
plugin: "cloudrun"
identities:
- plugin: "gcp-service-account"
- plugin: "service-account"
properties:
project_id: "my-project-123"
trusted_actions:
Expand Down
2 changes: 1 addition & 1 deletion serviceaccount/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: gcp-service-account
name: service-account
display_name: Service Account
type: identity
description: "Creates service accounts for GCP resource authentication"
Expand Down
6 changes: 3 additions & 3 deletions storage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This plugin creates Cloud Storage buckets with:
```yaml
buckets:
uploads:
plugin: "gcp-storage-bucket"
plugin: "storage-bucket"
properties:
project_id: "my-project-123"
region: "us-central1"
Expand All @@ -61,7 +61,7 @@ buckets:
```yaml
buckets:
backups:
plugin: "gcp-storage-bucket"
plugin: "storage-bucket"
properties:
project_id: "my-project-123"
region: "us-central1"
Expand All @@ -73,7 +73,7 @@ buckets:
```yaml
buckets:
reports:
plugin: "gcp-storage-bucket"
plugin: "storage-bucket"
properties:
project_id: "my-project-123"
region: "us-central1"
Expand Down
5 changes: 3 additions & 2 deletions storage/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: gcp-storage-bucket
name: storage-bucket
display_name: Storage
type: storage
description: "Provisions GCS buckets with custom access controls and automatic file upload"
icon: ./icon.svg
deployment:
terraform: ./module
runtime:
go_module: github.com/nitrictech/plugins/gcp/storage
go_module: github.com/nitrictech/plugins-gcp/storage

inputs:
project_id:
Expand Down
2 changes: 1 addition & 1 deletion storage/module/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ resource "google_project_iam_member" "iam_access" {

project = var.project_id
role = google_project_iam_custom_role.bucket_access_role[each.key].name
member = "serviceAccount:${each.value.identities["gcp:iam:role"].exports["gcp_service_account:email"]}"
member = "serviceAccount:${each.value.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]}"
}

locals {
Expand Down