Merge pull request #10 from combor/ona_runner_scm_integration

bump `gitpod-sdk-go` to `v0.13.0`

Author: combor

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -57,7 +57,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -82,7 +82,7 @@ jobs:
       GITPOD_API_KEY: ${{ secrets.GITPOD_API_KEY }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -143,7 +143,7 @@ jobs:
         with:
           # Allow goreleaser to access older tag information.
           fetch-depth: 0
-      - uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: 'go.mod'
           cache: true

AGENTS.md

@@ -59,6 +59,6 @@ act push -j integration \
   -s RUNNER_MANAGER_ID=01984227-2946-7e40-a982-2f427741f5da
 ```
 
-This runs the local `integration` matrix for Terraform `1.7.*` and `1.14.*` against the real Gitpod API. It first applies and destroys `examples/cleanup`, then applies and destroys the main `examples/` configuration, which currently exercises `ona_runner`, `ona_runner_scm_integration`, `ona_project`, and `ona_secret`.
+This runs the local `integration` matrix for Terraform `1.7.*` and `1.14.*` against the real Gitpod API. It first applies and destroys `examples/cleanup`, then applies and destroys the main `examples/` configuration, which currently exercises `ona_runner`, `ona_project`, and `ona_secret`. (`ona_runner_scm_integration` is not included because SCM integrations cannot be added to Gitpod-managed runners.)
 
 Requires `GITPOD_API_KEY` to be set. The integration job also requires `RUNNER_MANAGER_ID`.

examples/main.tf

@@ -78,13 +78,6 @@ data "ona_project" "example" {
   id = ona_project.example.id
 }
 
-resource "ona_runner_scm_integration" "example" {
-  runner_id = ona_runner.example.id
-  scm_id    = "github"
-  host      = "github.com"
-  pat       = true
-}
-
 resource "ona_secret" "example" {
   name       = "TF_CI_SECRET"
   value      = var.secret_value

go.mod

@@ -1,9 +1,9 @@
 module github.com/combor/terraform-provider-ona
 
-go 1.26.1
+go 1.26.2
 
 require (
-	github.com/gitpod-io/gitpod-sdk-go v0.12.0
+	github.com/gitpod-io/gitpod-sdk-go v0.13.0
 	github.com/hashicorp/terraform-plugin-framework v1.19.0
 	github.com/hashicorp/terraform-plugin-go v0.31.0
 	github.com/hashicorp/terraform-plugin-log v0.10.0

go.sum

@@ -26,8 +26,8 @@ github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FM
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
 github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
-github.com/gitpod-io/gitpod-sdk-go v0.12.0 h1:t07zjnbJvuyTnSLtpVo/ddd0gIbHfvonKZGxKbJwrk0=
-github.com/gitpod-io/gitpod-sdk-go v0.12.0/go.mod h1:4mCKUT0lDkx/sJBRamDZNvE4BDNghPs4p4mte2+Dz0A=
+github.com/gitpod-io/gitpod-sdk-go v0.13.0 h1:yu9onZoBJUiI7ar+fSM09iF9eBhZajVtsyxZMON9uM8=
+github.com/gitpod-io/gitpod-sdk-go v0.13.0/go.mod h1:4mCKUT0lDkx/sJBRamDZNvE4BDNghPs4p4mte2+Dz0A=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=

internal/provider/authenticated_identity_data_source.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	gitpod "github.com/gitpod-io/gitpod-sdk-go"
-	"github.com/gitpod-io/gitpod-sdk-go/shared"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -41,6 +40,10 @@ func (d *authenticatedIdentityDataSource) Schema(_ context.Context, _ datasource
 				Computed:            true,
 				MarkdownDescription: "Organization ID associated with the authenticated identity.",
 			},
+			"organization_tier": schema.StringAttribute{
+				Computed:            true,
+				MarkdownDescription: "Organization tier (e.g. plan level) of the authenticated identity.",
+			},
 		},
 	}
 }
@@ -67,20 +70,22 @@ func (d *authenticatedIdentityDataSource) Read(ctx context.Context, _ datasource
 		return
 	}
 
-	state := mapAuthenticatedIdentityToDataSourceModel(getResp.OrganizationID, getResp.Subject)
+	state := mapAuthenticatedIdentityToDataSourceModel(getResp)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }
 
-func mapAuthenticatedIdentityToDataSourceModel(organizationID string, subject shared.Subject) authenticatedIdentityDataSourceModel {
+func mapAuthenticatedIdentityToDataSourceModel(resp *gitpod.IdentityGetAuthenticatedIdentityResponse) authenticatedIdentityDataSourceModel {
 	return authenticatedIdentityDataSourceModel{
-		ID:             stringValueOrNull(subject.ID),
-		Principal:      stringValueOrNull(string(subject.Principal)),
-		OrganizationID: stringValueOrNull(organizationID),
+		ID:               stringValueOrNull(resp.Subject.ID),
+		Principal:        stringValueOrNull(string(resp.Subject.Principal)),
+		OrganizationID:   stringValueOrNull(resp.OrganizationID),
+		OrganizationTier: stringValueOrNull(resp.OrganizationTier),
 	}
 }
 
 type authenticatedIdentityDataSourceModel struct {
-	ID             types.String `tfsdk:"id"`
-	Principal      types.String `tfsdk:"principal"`
-	OrganizationID types.String `tfsdk:"organization_id"`
+	ID               types.String `tfsdk:"id"`
+	Principal        types.String `tfsdk:"principal"`
+	OrganizationID   types.String `tfsdk:"organization_id"`
+	OrganizationTier types.String `tfsdk:"organization_tier"`
 }

internal/provider/authenticated_identity_data_source_test.go

@@ -3,17 +3,23 @@ package provider
 import (
 	"testing"
 
+	gitpod "github.com/gitpod-io/gitpod-sdk-go"
 	"github.com/gitpod-io/gitpod-sdk-go/shared"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestMapAuthenticatedIdentityToDataSourceModel(t *testing.T) {
-	got := mapAuthenticatedIdentityToDataSourceModel("org-123", shared.Subject{
-		ID:        "subject-123",
-		Principal: shared.PrincipalUser,
+	got := mapAuthenticatedIdentityToDataSourceModel(&gitpod.IdentityGetAuthenticatedIdentityResponse{
+		OrganizationID:   "org-123",
+		OrganizationTier: "pro",
+		Subject: shared.Subject{
+			ID:        "subject-123",
+			Principal: shared.PrincipalUser,
+		},
 	})
 
 	assert.Equal(t, "subject-123", got.ID.ValueString())
 	assert.Equal(t, string(shared.PrincipalUser), got.Principal.ValueString())
 	assert.Equal(t, "org-123", got.OrganizationID.ValueString())
+	assert.Equal(t, "pro", got.OrganizationTier.ValueString())
 }

internal/provider/data_source.go

@@ -83,9 +83,24 @@ func (d *runnerDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 							"metrics": schema.SingleNestedAttribute{
 								Computed: true,
 								Attributes: map[string]schema.Attribute{
-									"enabled":  schema.BoolAttribute{Computed: true},
-									"url":      schema.StringAttribute{Computed: true},
-									"username": schema.StringAttribute{Computed: true},
+									"enabled":                 schema.BoolAttribute{Computed: true},
+									"managed_metrics_enabled": schema.BoolAttribute{Computed: true, MarkdownDescription: "When true, the runner pushes metrics to the management plane instead of directly to the remote_write endpoint."},
+									"url":                     schema.StringAttribute{Computed: true},
+									"username":                schema.StringAttribute{Computed: true},
+								},
+							},
+							"update_window": schema.SingleNestedAttribute{
+								Computed:            true,
+								MarkdownDescription: "Daily time window (UTC) during which auto-updates are allowed.",
+								Attributes: map[string]schema.Attribute{
+									"start_hour": schema.Int64Attribute{
+										Computed:            true,
+										MarkdownDescription: "Start of the update window as a UTC hour (0-23).",
+									},
+									"end_hour": schema.Int64Attribute{
+										Computed:            true,
+										MarkdownDescription: "End of the update window as a UTC hour (0-23).",
+									},
 								},
 							},
 						},
@@ -158,20 +173,9 @@ func mapRunnerToDataSourceModel(runner gitpod.Runner) runnerDataSourceModel {
 	}
 
 	m.Spec = &runnerDataSourceSpecModel{
-		DesiredPhase: stringValueOrNull(string(runner.Spec.DesiredPhase)),
-		Variant:      stringValueOrNull(string(runner.Spec.Variant)),
-		Configuration: &runnerDataSourceConfigModel{
-			AutoUpdate:                    types.BoolValue(runner.Spec.Configuration.AutoUpdate),
-			DevcontainerImageCacheEnabled: types.BoolValue(runner.Spec.Configuration.DevcontainerImageCacheEnabled),
-			Region:                        stringValueOrNull(runner.Spec.Configuration.Region),
-			ReleaseChannel:                stringValueOrNull(string(runner.Spec.Configuration.ReleaseChannel)),
-			LogLevel:                      stringValueOrNull(string(runner.Spec.Configuration.LogLevel)),
-			Metrics: &runnerDataSourceMetricsModel{
-				Enabled:  types.BoolValue(runner.Spec.Configuration.Metrics.Enabled),
-				URL:      stringValueOrNull(runner.Spec.Configuration.Metrics.URL),
-				Username: stringValueOrNull(runner.Spec.Configuration.Metrics.Username),
-			},
-		},
+		DesiredPhase:  stringValueOrNull(string(runner.Spec.DesiredPhase)),
+		Variant:       stringValueOrNull(string(runner.Spec.Variant)),
+		Configuration: mapRunnerConfigToDataSourceModel(runner),
 	}
 
 	statusAttrTypes := map[string]attr.Type{
@@ -191,6 +195,29 @@ func mapRunnerToDataSourceModel(runner gitpod.Runner) runnerDataSourceModel {
 	return m
 }
 
+func mapRunnerConfigToDataSourceModel(runner gitpod.Runner) *runnerDataSourceConfigModel {
+	cfg := &runnerDataSourceConfigModel{
+		AutoUpdate:                    types.BoolValue(runner.Spec.Configuration.AutoUpdate),
+		DevcontainerImageCacheEnabled: types.BoolValue(runner.Spec.Configuration.DevcontainerImageCacheEnabled),
+		Region:                        stringValueOrNull(runner.Spec.Configuration.Region),
+		ReleaseChannel:                stringValueOrNull(string(runner.Spec.Configuration.ReleaseChannel)),
+		LogLevel:                      stringValueOrNull(string(runner.Spec.Configuration.LogLevel)),
+		Metrics: &runnerDataSourceMetricsModel{
+			Enabled:               types.BoolValue(runner.Spec.Configuration.Metrics.Enabled),
+			ManagedMetricsEnabled: types.BoolValue(runner.Spec.Configuration.Metrics.ManagedMetricsEnabled),
+			URL:                   stringValueOrNull(runner.Spec.Configuration.Metrics.URL),
+			Username:              stringValueOrNull(runner.Spec.Configuration.Metrics.Username),
+		},
+	}
+	if startHour, endHour, ok := mapUpdateWindowValues(runner.Spec.Configuration.UpdateWindow); ok {
+		cfg.UpdateWindow = &runnerDataSourceUpdateWindowModel{
+			StartHour: startHour,
+			EndHour:   endHour,
+		}
+	}
+	return cfg
+}
+
 // Data source models — separate from resource models since all fields
 // are computed and there's no password field (API doesn't return it).
 
@@ -210,16 +237,23 @@ type runnerDataSourceSpecModel struct {
 }
 
 type runnerDataSourceConfigModel struct {
-	AutoUpdate                    types.Bool                    `tfsdk:"auto_update"`
-	DevcontainerImageCacheEnabled types.Bool                    `tfsdk:"devcontainer_image_cache_enabled"`
-	Region                        types.String                  `tfsdk:"region"`
-	ReleaseChannel                types.String                  `tfsdk:"release_channel"`
-	LogLevel                      types.String                  `tfsdk:"log_level"`
-	Metrics                       *runnerDataSourceMetricsModel `tfsdk:"metrics"`
+	AutoUpdate                    types.Bool                         `tfsdk:"auto_update"`
+	DevcontainerImageCacheEnabled types.Bool                         `tfsdk:"devcontainer_image_cache_enabled"`
+	Region                        types.String                       `tfsdk:"region"`
+	ReleaseChannel                types.String                       `tfsdk:"release_channel"`
+	LogLevel                      types.String                       `tfsdk:"log_level"`
+	Metrics                       *runnerDataSourceMetricsModel      `tfsdk:"metrics"`
+	UpdateWindow                  *runnerDataSourceUpdateWindowModel `tfsdk:"update_window"`
+}
+
+type runnerDataSourceUpdateWindowModel struct {
+	StartHour types.Int64 `tfsdk:"start_hour"`
+	EndHour   types.Int64 `tfsdk:"end_hour"`
 }
 
 type runnerDataSourceMetricsModel struct {
-	Enabled  types.Bool   `tfsdk:"enabled"`
-	URL      types.String `tfsdk:"url"`
-	Username types.String `tfsdk:"username"`
+	Enabled               types.Bool   `tfsdk:"enabled"`
+	ManagedMetricsEnabled types.Bool   `tfsdk:"managed_metrics_enabled"`
+	URL                   types.String `tfsdk:"url"`
+	Username              types.String `tfsdk:"username"`
 }

internal/provider/helpers.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	gitpod "github.com/gitpod-io/gitpod-sdk-go"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -50,3 +51,16 @@ func timeValueOrNull(value time.Time) types.String {
 	}
 	return types.StringValue(value.Format(time.RFC3339Nano))
 }
+
+func mapUpdateWindowValues(window gitpod.UpdateWindow) (types.Int64, types.Int64, bool) {
+	if window.JSON.RawJSON() == "" {
+		return types.Int64Null(), types.Int64Null(), false
+	}
+
+	endHour := types.Int64Null()
+	if !window.JSON.EndHour.IsMissing() {
+		endHour = types.Int64Value(window.EndHour)
+	}
+
+	return types.Int64Value(window.StartHour), endHour, true
+}