From 05ddc0417e8dfa5e77d8aabd55624aa18033e6c4 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Fri, 17 Apr 2026 19:39:25 -0500 Subject: [PATCH 1/2] chore: replace loft-sh references with devsy-sh and update workflows Update openapi model package annotations and generated model names from loft-sh/agentapi/v4 to devsy-sh/agentapi. Update GitHub Actions workflows to use devsy org secrets and latest action versions. --- .github/workflows/release-please.yaml | 6 +-- .github/workflows/workflow-approval.yml | 8 +-- pkg/apis/devsy/cluster/v1/doc.go | 2 +- .../cluster/v1/zz_generated.model_name.go | 52 +++++++++---------- pkg/apis/devsy/storage/doc.go | 2 +- pkg/apis/devsy/storage/v1/doc.go | 2 +- .../storage/v1/zz_generated.model_name.go | 12 ++--- pkg/openapi/zz_generated.openapi.go | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index f36d817..da8fff4 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -12,11 +12,11 @@ jobs: release-please: runs-on: ubuntu-latest steps: - - uses: actions/create-github-app-token@v2 + - uses: actions/create-github-app-token@v3 id: app-token with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} + app-id: ${{ secrets.DEVSY_GITHUB_APP_ID }} + private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }} - uses: googleapis/release-please-action@v4 id: release diff --git a/.github/workflows/workflow-approval.yml b/.github/workflows/workflow-approval.yml index 0db65ad..9fb5214 100644 --- a/.github/workflows/workflow-approval.yml +++ b/.github/workflows/workflow-approval.yml @@ -10,13 +10,13 @@ jobs: name: Approve Workflows runs-on: ubuntu-latest steps: - - uses: actions/create-github-app-token@v2 + - uses: actions/create-github-app-token@v3 id: app-token with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} + app-id: ${{ secrets.DEVSY_GITHUB_APP_ID }} + private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }} - - uses: mheap/automatic-approve-action@v1 + - uses: skevetter/automatic-approve-action@v2 with: token: ${{ steps.app-token.outputs.token }} workflows: "commit.yml,lint.yml,pre-commit.yml" diff --git a/pkg/apis/devsy/cluster/v1/doc.go b/pkg/apis/devsy/cluster/v1/doc.go index 1b5aafb..37bc6e3 100644 --- a/pkg/apis/devsy/cluster/v1/doc.go +++ b/pkg/apis/devsy/cluster/v1/doc.go @@ -3,7 +3,7 @@ // of the same resource // +k8s:openapi-gen=true -// +k8s:openapi-model-package=com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1 +// +k8s:openapi-model-package=com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1 // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=github.com/skevetter/agentapi/pkg/apis/devsy/cluster // +k8s:defaulter-gen=TypeMeta diff --git a/pkg/apis/devsy/cluster/v1/zz_generated.model_name.go b/pkg/apis/devsy/cluster/v1/zz_generated.model_name.go index 2b515e2..9bc885f 100644 --- a/pkg/apis/devsy/cluster/v1/zz_generated.model_name.go +++ b/pkg/apis/devsy/cluster/v1/zz_generated.model_name.go @@ -7,130 +7,130 @@ package v1 // OpenAPIModelName returns the OpenAPI model name for this type. func (in Bash) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Bash" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Bash" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Chart) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Chart" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Chart" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ChartInfo) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ChartInfo" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ChartInfo" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ChartInfoList) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ChartInfoList" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ChartInfoList" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ChartInfoSpec) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ChartInfoSpec" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ChartInfoSpec" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ChartInfoStatus) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ChartInfoStatus" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ChartInfoStatus" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ChartSecretRef) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ChartSecretRef" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ChartSecretRef" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in EpochInfo) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.EpochInfo" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.EpochInfo" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Feature) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Feature" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Feature" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in FeatureList) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.FeatureList" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.FeatureList" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in FeatureSpec) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.FeatureSpec" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.FeatureSpec" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in FeatureStatus) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.FeatureStatus" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.FeatureStatus" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmRelease) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmRelease" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmRelease" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmReleaseApp) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmReleaseApp" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmReleaseApp" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmReleaseConfig) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmReleaseConfig" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmReleaseConfig" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmReleaseList) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmReleaseList" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmReleaseList" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmReleaseSpec) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmReleaseSpec" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmReleaseSpec" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in HelmReleaseStatus) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.HelmReleaseStatus" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.HelmReleaseStatus" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Info) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Info" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Info" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in LastActivityInfo) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.LastActivityInfo" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.LastActivityInfo" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Maintainer) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Maintainer" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Maintainer" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Metadata) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.Metadata" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.Metadata" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ProjectSecretRef) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.ProjectSecretRef" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.ProjectSecretRef" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in SleepModeConfig) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.SleepModeConfig" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.SleepModeConfig" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in SleepModeConfigSpec) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.SleepModeConfigSpec" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.SleepModeConfigSpec" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in SleepModeConfigStatus) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.cluster.v1.SleepModeConfigStatus" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.cluster.v1.SleepModeConfigStatus" } diff --git a/pkg/apis/devsy/storage/doc.go b/pkg/apis/devsy/storage/doc.go index 0d5951b..b00daf3 100644 --- a/pkg/apis/devsy/storage/doc.go +++ b/pkg/apis/devsy/storage/doc.go @@ -1,4 +1,4 @@ // +k8s:openapi-gen=true -// +k8s:openapi-model-package=com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage +// +k8s:openapi-model-package=com.github.devsy-sh.agentapi.pkg.apis.devsy.storage // +groupName=storage.devsy.sh package storage diff --git a/pkg/apis/devsy/storage/v1/doc.go b/pkg/apis/devsy/storage/v1/doc.go index 68b581d..dafca0d 100644 --- a/pkg/apis/devsy/storage/v1/doc.go +++ b/pkg/apis/devsy/storage/v1/doc.go @@ -3,7 +3,7 @@ // of the same resource // +k8s:openapi-gen=true -// +k8s:openapi-model-package=com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1 +// +k8s:openapi-model-package=com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1 // +k8s:deepcopy-gen=package // +k8s:defaulter-gen=TypeMeta // +groupName=storage.devsy.sh diff --git a/pkg/apis/devsy/storage/v1/zz_generated.model_name.go b/pkg/apis/devsy/storage/v1/zz_generated.model_name.go index 488b46d..35d3d3c 100644 --- a/pkg/apis/devsy/storage/v1/zz_generated.model_name.go +++ b/pkg/apis/devsy/storage/v1/zz_generated.model_name.go @@ -7,30 +7,30 @@ package v1 // OpenAPIModelName returns the OpenAPI model name for this type. func (in ClusterQuota) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.ClusterQuota" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.ClusterQuota" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ClusterQuotaList) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.ClusterQuotaList" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.ClusterQuotaList" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ClusterQuotaSpec) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.ClusterQuotaSpec" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.ClusterQuotaSpec" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ClusterQuotaStatus) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.ClusterQuotaStatus" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.ClusterQuotaStatus" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in ClusterQuotaStatusByNamespace) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.ClusterQuotaStatusByNamespace" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.ClusterQuotaStatusByNamespace" } // OpenAPIModelName returns the OpenAPI model name for this type. func (in Condition) OpenAPIModelName() string { - return "com.github.loft-sh.agentapi.v4.pkg.apis.loft.storage.v1.Condition" + return "com.github.devsy-sh.agentapi.pkg.apis.devsy.storage.v1.Condition" } diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index fab6f1d..5f0bb94 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -926,7 +926,7 @@ func schema_skevetter_admin_apis_pkg_licenseapi_InstanceCreateInput(ref common.R }, "product": { SchemaProps: spec.SchemaProps{ - Description: "Product is the product that is being used. Can be empty, devsy, devpod-pro or devsy-pro. This should NOT be a ProductName but a string to allow for downward compatibility", + Description: "Product is the product that is being used. Can be empty, devsy or devsy-pro. This should NOT be a ProductName but a string to allow for downward compatibility", Type: []string{"string"}, Format: "", }, From efe20f3ab3f8eefd42d0fc760b40f26c0783550e Mon Sep 17 00:00:00 2001 From: Samuel K Date: Fri, 17 Apr 2026 19:41:59 -0500 Subject: [PATCH 2/2] fix: revert manual edit to generated openapi file The devpod-pro reference comes from the upstream admin-apis dependency comment and must be fixed there, not in the generated output. --- pkg/openapi/zz_generated.openapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index 5f0bb94..fab6f1d 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -926,7 +926,7 @@ func schema_skevetter_admin_apis_pkg_licenseapi_InstanceCreateInput(ref common.R }, "product": { SchemaProps: spec.SchemaProps{ - Description: "Product is the product that is being used. Can be empty, devsy or devsy-pro. This should NOT be a ProductName but a string to allow for downward compatibility", + Description: "Product is the product that is being used. Can be empty, devsy, devpod-pro or devsy-pro. This should NOT be a ProductName but a string to allow for downward compatibility", Type: []string{"string"}, Format: "", },