diff --git a/.github/workflows/go-version-update.yml b/.github/workflows/go-version-update.yml index 74b882b..77443c3 100644 --- a/.github/workflows/go-version-update.yml +++ b/.github/workflows/go-version-update.yml @@ -133,6 +133,6 @@ jobs: ${{ matrix.env.module }} - Created by the [`update-go-version` GitHub Actions workflow](https://github.com/rstudio/ptd/actions/workflows/update-go-version.yml). + Created by the [`go-version-update` GitHub Actions workflow](https://github.com/posit-dev/ptd/actions/workflows/go-version-update.yml). branch: bump-${{ matrix.env.group }}-go-toolchain-to-${{ steps.latest.outputs.version }} labels: dependencies diff --git a/cmd/admin.go b/cmd/admin.go index 8637e3a..6692228 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -6,12 +6,12 @@ import ( "log/slog" "strings" - "github.com/rstudio/ptd/cmd/internal/legacy" - "github.com/rstudio/ptd/lib/consts" + "github.com/posit-dev/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/lib/consts" - "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/types" "github.com/spf13/cobra" "gopkg.in/yaml.v3" ) diff --git a/cmd/assume.go b/cmd/assume.go index cb80cfe..fa96a64 100644 --- a/cmd/assume.go +++ b/cmd/assume.go @@ -4,7 +4,7 @@ import ( "log/slog" "os" - "github.com/rstudio/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/cmd/internal/legacy" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/cmd/config.go b/cmd/config.go index 7d45768..52b1ccb 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/rstudio/ptd/cmd/internal" - "github.com/rstudio/ptd/lib/helpers" + "github.com/posit-dev/ptd/cmd/internal" + "github.com/posit-dev/ptd/lib/helpers" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/ensure.go b/cmd/ensure.go index 2e79dac..ca475fe 100644 --- a/cmd/ensure.go +++ b/cmd/ensure.go @@ -6,12 +6,12 @@ import ( "log/slog" "slices" - "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/azure" + "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/azure" - "github.com/rstudio/ptd/cmd/internal/legacy" - "github.com/rstudio/ptd/lib/steps" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/lib/steps" + "github.com/posit-dev/ptd/lib/types" "github.com/spf13/cobra" ) diff --git a/cmd/go.mod b/cmd/go.mod index d6477a7..46ac035 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -1,12 +1,12 @@ -module github.com/rstudio/ptd/cmd +module github.com/posit-dev/ptd/cmd go 1.25.3 -replace github.com/rstudio/ptd/lib => ../lib +replace github.com/posit-dev/ptd/lib => ../lib require ( github.com/charmbracelet/log v0.4.2 - github.com/rstudio/ptd/lib v0.0.0-00010101000000-000000000000 + github.com/posit-dev/ptd/lib v0.0.0-00010101000000-000000000000 github.com/spf13/cobra v1.9.1 github.com/spf13/viper v1.20.1 golang.org/x/term v0.37.0 diff --git a/cmd/hash.go b/cmd/hash.go index 7de697a..da1f94f 100644 --- a/cmd/hash.go +++ b/cmd/hash.go @@ -3,7 +3,7 @@ package main import ( "log/slog" - "github.com/rstudio/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/cmd/internal/legacy" "github.com/spf13/cobra" ) diff --git a/cmd/internal/legacy/ptd_config.go b/cmd/internal/legacy/ptd_config.go index 384cc9b..c417da2 100644 --- a/cmd/internal/legacy/ptd_config.go +++ b/cmd/internal/legacy/ptd_config.go @@ -7,11 +7,11 @@ import ( "slices" "strings" - "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/azure" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/steps" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/azure" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/steps" + "github.com/posit-dev/ptd/lib/types" "github.com/spf13/cobra" ) diff --git a/cmd/k9s.go b/cmd/k9s.go index 15adfc7..c89a97d 100644 --- a/cmd/k9s.go +++ b/cmd/k9s.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - "github.com/rstudio/ptd/cmd/internal/legacy" - awslib "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/azure" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/cmd/internal/legacy" + awslib "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/azure" + "github.com/posit-dev/ptd/lib/types" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" "tailscale.com/client/local" diff --git a/cmd/main.go b/cmd/main.go index 1c6120a..03233a4 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/charmbracelet/log" - "github.com/rstudio/ptd/cmd/internal" - "github.com/rstudio/ptd/lib/helpers" + "github.com/posit-dev/ptd/cmd/internal" + "github.com/posit-dev/ptd/lib/helpers" "github.com/spf13/cobra" "github.com/spf13/viper" "golang.org/x/term" diff --git a/cmd/proxy.go b/cmd/proxy.go index 8699165..6357f26 100644 --- a/cmd/proxy.go +++ b/cmd/proxy.go @@ -1,15 +1,16 @@ package main import ( - "github.com/rstudio/ptd/lib/azure" "log/slog" "os" "path" - "github.com/rstudio/ptd/cmd/internal" - "github.com/rstudio/ptd/cmd/internal/legacy" - "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/proxy" + "github.com/posit-dev/ptd/lib/azure" + + "github.com/posit-dev/ptd/cmd/internal" + "github.com/posit-dev/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/proxy" "github.com/spf13/cobra" ) diff --git a/cmd/workon.go b/cmd/workon.go index 2d4f87a..8b51e42 100644 --- a/cmd/workon.go +++ b/cmd/workon.go @@ -5,9 +5,9 @@ import ( "os" "os/exec" - "github.com/rstudio/ptd/cmd/internal/legacy" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/steps" + "github.com/posit-dev/ptd/cmd/internal/legacy" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/steps" "github.com/spf13/cobra" ) diff --git a/docs/cli/custom-steps.md b/docs/cli/custom-steps.md index f9c24c2..dcd236d 100644 --- a/docs/cli/custom-steps.md +++ b/docs/cli/custom-steps.md @@ -60,7 +60,7 @@ func main() { Initialize the Go module: ```bash -go mod init github.com/rstudio/ptd/workloads/your-workload/my-custom-step +go mod init github.com/posit-dev/ptd/workloads/your-workload/my-custom-step go get github.com/pulumi/pulumi/sdk/v3@latest go get github.com/pulumi/pulumi-aws/sdk/v6@latest go mod tidy @@ -149,7 +149,7 @@ customizations/ ```bash cd customizations/my-step -go mod init github.com/rstudio/ptd/workloads//my-step +go mod init github.com/posit-dev/ptd/workloads//my-step # Add Pulumi dependencies go get github.com/pulumi/pulumi/sdk/v3@latest @@ -182,10 +182,10 @@ Custom steps can access useful functions and types from the PTD library. Until t cd customizations/my-step # Add the PTD library as a dependency -go get github.com/rstudio/ptd/lib +go get github.com/posit-dev/ptd/lib # Add a replace directive to use the local copy -go mod edit -replace github.com/rstudio/ptd/lib=../../../lib +go mod edit -replace github.com/posit-dev/ptd/lib=../../../lib go mod tidy ``` @@ -194,20 +194,20 @@ Your `go.mod` will include: ```go require ( - github.com/rstudio/ptd/lib v0.0.0-00010101000000-000000000000 + github.com/posit-dev/ptd/lib v0.0.0-00010101000000-000000000000 ) -replace github.com/rstudio/ptd/lib => ../../../lib +replace github.com/posit-dev/ptd/lib => ../../../lib ``` #### Available Library Packages The PTD library provides several useful packages: -- **`github.com/rstudio/ptd/lib/helpers`**: Utility functions including: +- **`github.com/posit-dev/ptd/lib/helpers`**: Utility functions including: - `LoadPtdYaml(path string)`: Load and parse the ptd.yaml configuration file -- **`github.com/rstudio/ptd/lib/types`**: Configuration types including: +- **`github.com/posit-dev/ptd/lib/types`**: Configuration types including: - `AWSWorkloadConfig`: AWS workload configuration with resource tags - `AzureWorkloadConfig`: Azure workload configuration with resource tags @@ -223,8 +223,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/types" ) func main() { diff --git a/examples/custom-steps/simple-s3-bucket/go.mod b/examples/custom-steps/simple-s3-bucket/go.mod index b3e1b2b..1b82d01 100644 --- a/examples/custom-steps/simple-s3-bucket/go.mod +++ b/examples/custom-steps/simple-s3-bucket/go.mod @@ -1,11 +1,11 @@ -module github.com/rstudio/ptd/examples/custom-steps/simple-s3-bucket +module github.com/posit-dev/ptd/examples/custom-steps/simple-s3-bucket go 1.25.3 require ( + github.com/posit-dev/ptd/lib v0.0.0-00010101000000-000000000000 github.com/pulumi/pulumi-aws/sdk/v6 v6.83.0 github.com/pulumi/pulumi/sdk/v3 v3.193.0 - github.com/rstudio/ptd/lib v0.0.0-00010101000000-000000000000 ) require ( @@ -107,4 +107,4 @@ require ( sigs.k8s.io/yaml v1.5.0 // indirect ) -replace github.com/rstudio/ptd/lib => ../../../lib +replace github.com/posit-dev/ptd/lib => ../../../lib diff --git a/examples/custom-steps/simple-s3-bucket/main.go b/examples/custom-steps/simple-s3-bucket/main.go index e52d1f1..455fb08 100644 --- a/examples/custom-steps/simple-s3-bucket/main.go +++ b/examples/custom-steps/simple-s3-bucket/main.go @@ -7,8 +7,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/types" ) func main() { diff --git a/lib/aws/credentials.go b/lib/aws/credentials.go index ba6f52e..72721d1 100644 --- a/lib/aws/credentials.go +++ b/lib/aws/credentials.go @@ -4,15 +4,16 @@ import ( "context" "encoding/json" "fmt" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/config" - "github.com/aws/aws-sdk-go-v2/credentials" - "github.com/aws/aws-sdk-go-v2/service/sts" - "github.com/rstudio/ptd/lib/types" "log/slog" "os/exec" "regexp" "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/credentials" + "github.com/aws/aws-sdk-go-v2/service/sts" + "github.com/posit-dev/ptd/lib/types" ) var positEmail = regexp.MustCompile(`[^:]*@posit\.co$`) diff --git a/lib/aws/ecr.go b/lib/aws/ecr.go index 3fe39bd..89a6659 100644 --- a/lib/aws/ecr.go +++ b/lib/aws/ecr.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ecr" ecrTypes "github.com/aws/aws-sdk-go-v2/service/ecr/types" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/types" ) func GetEcrAuthToken(ctx context.Context, c *Credentials, region string) (string, error) { diff --git a/lib/aws/iam.go b/lib/aws/iam.go index 7e6d1f4..27670d4 100644 --- a/lib/aws/iam.go +++ b/lib/aws/iam.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/iam/types" - "github.com/rstudio/ptd/lib/consts" + "github.com/posit-dev/ptd/lib/consts" "gopkg.in/yaml.v3" ) diff --git a/lib/aws/kms.go b/lib/aws/kms.go index 6162022..72dabba 100644 --- a/lib/aws/kms.go +++ b/lib/aws/kms.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/rstudio/ptd/lib/consts" + "github.com/posit-dev/ptd/lib/consts" ) func KmsKeyExists(ctx context.Context, c *Credentials, region string, keyId string) bool { diff --git a/lib/aws/proxy.go b/lib/aws/proxy.go index 32c2a4e..ebc9440 100644 --- a/lib/aws/proxy.go +++ b/lib/aws/proxy.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/proxy" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/proxy" "tailscale.com/client/local" ) diff --git a/lib/aws/registry.go b/lib/aws/registry.go index 7c94fc0..bfa5670 100644 --- a/lib/aws/registry.go +++ b/lib/aws/registry.go @@ -3,8 +3,9 @@ package aws import ( "context" "fmt" - "github.com/rstudio/ptd/lib/types" "strings" + + "github.com/posit-dev/ptd/lib/types" ) type Registry struct { diff --git a/lib/aws/secretsmanager.go b/lib/aws/secretsmanager.go index 0284076..0ea6fff 100644 --- a/lib/aws/secretsmanager.go +++ b/lib/aws/secretsmanager.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" - "github.com/rstudio/ptd/lib/consts" + "github.com/posit-dev/ptd/lib/consts" ) func getSecretValue(ctx context.Context, c *Credentials, region string, secretName string) (secretString string, err error) { diff --git a/lib/aws/secretstore.go b/lib/aws/secretstore.go index 4e82b59..810b071 100644 --- a/lib/aws/secretstore.go +++ b/lib/aws/secretstore.go @@ -4,8 +4,9 @@ import ( "context" "encoding/json" "fmt" - "github.com/rstudio/ptd/lib/secrets" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/secrets" + "github.com/posit-dev/ptd/lib/types" ) type SecretStore struct { diff --git a/lib/aws/target.go b/lib/aws/target.go index b646e42..008b679 100644 --- a/lib/aws/target.go +++ b/lib/aws/target.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type Target struct { diff --git a/lib/aws/target_test.go b/lib/aws/target_test.go index bec97ba..27e4958 100644 --- a/lib/aws/target_test.go +++ b/lib/aws/target_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" "github.com/stretchr/testify/assert" ) diff --git a/lib/azure/credentials.go b/lib/azure/credentials.go index 89133e0..e2ee15d 100644 --- a/lib/azure/credentials.go +++ b/lib/azure/credentials.go @@ -3,10 +3,11 @@ package azure import ( "context" "fmt" + "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" - "github.com/rstudio/ptd/lib/azure/cli" + "github.com/posit-dev/ptd/lib/azure/cli" ) type Credentials struct { diff --git a/lib/azure/credentials_test.go b/lib/azure/credentials_test.go index 5af14b7..678c8c1 100644 --- a/lib/azure/credentials_test.go +++ b/lib/azure/credentials_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/rstudio/ptd/lib/azure/cli" + "github.com/posit-dev/ptd/lib/azure/cli" "github.com/stretchr/testify/assert" ) diff --git a/lib/azure/proxy.go b/lib/azure/proxy.go index bc274b9..8c4c685 100644 --- a/lib/azure/proxy.go +++ b/lib/azure/proxy.go @@ -10,9 +10,9 @@ import ( "regexp" "time" - "github.com/rstudio/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/proxy" + "github.com/posit-dev/ptd/lib/proxy" ) type ProxySession struct { diff --git a/lib/azure/registry.go b/lib/azure/registry.go index bf7be96..9f1e5ae 100644 --- a/lib/azure/registry.go +++ b/lib/azure/registry.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" ) const ( diff --git a/lib/azure/secretstore.go b/lib/azure/secretstore.go index 4e988af..fea1ef4 100644 --- a/lib/azure/secretstore.go +++ b/lib/azure/secretstore.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/rstudio/ptd/lib/secrets" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/secrets" + "github.com/posit-dev/ptd/lib/types" ) type SecretStore struct { diff --git a/lib/azure/target.go b/lib/azure/target.go index 0b08a88..665706b 100644 --- a/lib/azure/target.go +++ b/lib/azure/target.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type Target struct { diff --git a/lib/azure/target_test.go b/lib/azure/target_test.go index 4453792..0ba974d 100644 --- a/lib/azure/target_test.go +++ b/lib/azure/target_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/rstudio/ptd/lib/azure/cli" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/azure/cli" + "github.com/posit-dev/ptd/lib/types" "github.com/stretchr/testify/assert" ) diff --git a/lib/azure/validation.go b/lib/azure/validation.go index b333f78..288768f 100644 --- a/lib/azure/validation.go +++ b/lib/azure/validation.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" ) // ValidateUserNodePoolName validates that a node pool name meets AKS requirements diff --git a/lib/azure/validation_test.go b/lib/azure/validation_test.go index 4da49b4..1217696 100644 --- a/lib/azure/validation_test.go +++ b/lib/azure/validation_test.go @@ -3,7 +3,7 @@ package azure import ( "testing" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" "github.com/stretchr/testify/assert" ) diff --git a/lib/go.mod b/lib/go.mod index e22f33f..3998c5b 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -1,4 +1,4 @@ -module github.com/rstudio/ptd/lib +module github.com/posit-dev/ptd/lib go 1.25.3 diff --git a/lib/helpers/helpers.go b/lib/helpers/helpers.go index 9bcf40a..af40218 100644 --- a/lib/helpers/helpers.go +++ b/lib/helpers/helpers.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" "golang.org/x/text/cases" "golang.org/x/text/language" yaml "sigs.k8s.io/yaml/goyaml.v3" diff --git a/lib/helpers/helpers_test.go b/lib/helpers/helpers_test.go index 23c4833..b3ff168 100644 --- a/lib/helpers/helpers_test.go +++ b/lib/helpers/helpers_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/rstudio/ptd/lib/testdata" - "github.com/rstudio/ptd/lib/types" - "github.com/rstudio/ptd/lib/types/typestest" + "github.com/posit-dev/ptd/lib/testdata" + "github.com/posit-dev/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types/typestest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lib/proxy/proxy.go b/lib/proxy/proxy.go index e889d80..709fcc0 100644 --- a/lib/proxy/proxy.go +++ b/lib/proxy/proxy.go @@ -2,10 +2,11 @@ package proxy import ( "fmt" - "github.com/rstudio/ptd/lib/helpers" "log/slog" "os" "time" + + "github.com/posit-dev/ptd/lib/helpers" ) type RunningProxy struct { diff --git a/lib/pulumi/inline.go b/lib/pulumi/inline.go index c59907c..c4633ea 100644 --- a/lib/pulumi/inline.go +++ b/lib/pulumi/inline.go @@ -8,7 +8,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/auto" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" ) // Plugins required for the Pulumi stack. These should possibly be moved to a diff --git a/lib/pulumi/local.go b/lib/pulumi/local.go index ed0f0f6..17fa1f0 100644 --- a/lib/pulumi/local.go +++ b/lib/pulumi/local.go @@ -3,8 +3,8 @@ package pulumi import ( "context" + "github.com/posit-dev/ptd/lib/types" "github.com/pulumi/pulumi/sdk/v3/go/auto" - "github.com/rstudio/ptd/lib/types" ) // LocalStack creates a new Go Pulumi stack based on local source files with remote state backend diff --git a/lib/pulumi/pulumi.go b/lib/pulumi/pulumi.go index 8b06f40..115bdcb 100644 --- a/lib/pulumi/pulumi.go +++ b/lib/pulumi/pulumi.go @@ -6,12 +6,12 @@ import ( "log/slog" "os" + "github.com/posit-dev/ptd/lib/helpers" "github.com/pulumi/pulumi/sdk/v3/go/auto" "github.com/pulumi/pulumi/sdk/v3/go/auto/optdestroy" "github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview" "github.com/pulumi/pulumi/sdk/v3/go/auto/optrefresh" "github.com/pulumi/pulumi/sdk/v3/go/auto/optup" - "github.com/rstudio/ptd/lib/helpers" ) func RefreshStack(ctx context.Context, stack auto.Stack) (refreshResult auto.RefreshResult, err error) { diff --git a/lib/pulumi/python.go b/lib/pulumi/python.go index 6512b61..0121a1d 100644 --- a/lib/pulumi/python.go +++ b/lib/pulumi/python.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" + "github.com/posit-dev/ptd/lib/helpers" "github.com/pulumi/pulumi/sdk/v3/go/auto" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace" - "github.com/rstudio/ptd/lib/helpers" "github.com/spf13/viper" ) diff --git a/lib/secrets/secrets.go b/lib/secrets/secrets.go index efe7040..9f49936 100644 --- a/lib/secrets/secrets.go +++ b/lib/secrets/secrets.go @@ -2,8 +2,9 @@ package secrets import ( "fmt" - "github.com/rstudio/ptd/lib/helpers" "strings" + + "github.com/posit-dev/ptd/lib/helpers" ) type SiteSecret struct { diff --git a/lib/steps/aks.go b/lib/steps/aks.go index 41e4769..b69153e 100644 --- a/lib/steps/aks.go +++ b/lib/steps/aks.go @@ -9,10 +9,10 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/auto" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" - "github.com/rstudio/ptd/lib/azure" - "github.com/rstudio/ptd/lib/helpers" - ptdpulumi "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/azure" + "github.com/posit-dev/ptd/lib/helpers" + ptdpulumi "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type AKSStep struct { diff --git a/lib/steps/aks_test.go b/lib/steps/aks_test.go index 1b3b5b2..2380fc2 100644 --- a/lib/steps/aks_test.go +++ b/lib/steps/aks_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/rstudio/ptd/lib/types/typestest" + "github.com/posit-dev/ptd/lib/types/typestest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lib/steps/bootstrap.go b/lib/steps/bootstrap.go index 9cb653f..bdf638e 100644 --- a/lib/steps/bootstrap.go +++ b/lib/steps/bootstrap.go @@ -6,11 +6,11 @@ import ( "fmt" "log/slog" - "github.com/rstudio/ptd/lib/aws" - "github.com/rstudio/ptd/lib/azure" - "github.com/rstudio/ptd/lib/consts" - "github.com/rstudio/ptd/lib/secrets" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/aws" + "github.com/posit-dev/ptd/lib/azure" + "github.com/posit-dev/ptd/lib/consts" + "github.com/posit-dev/ptd/lib/secrets" + "github.com/posit-dev/ptd/lib/types" ) type BootstrapStep struct { diff --git a/lib/steps/cluster.go b/lib/steps/cluster.go index 8050388..a727112 100644 --- a/lib/steps/cluster.go +++ b/lib/steps/cluster.go @@ -3,8 +3,9 @@ package steps import ( "context" "fmt" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type ClusterStep struct { diff --git a/lib/steps/clusters.go b/lib/steps/clusters.go index 2e0fdd8..f8b30a5 100644 --- a/lib/steps/clusters.go +++ b/lib/steps/clusters.go @@ -2,8 +2,9 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type ClustersStep struct { diff --git a/lib/steps/custom_step.go b/lib/steps/custom_step.go index 93e392e..1336417 100644 --- a/lib/steps/custom_step.go +++ b/lib/steps/custom_step.go @@ -6,11 +6,11 @@ import ( "log/slog" "path/filepath" + "github.com/posit-dev/ptd/lib/customization" + "github.com/posit-dev/ptd/lib/helpers" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" "github.com/pulumi/pulumi/sdk/v3/go/auto" - "github.com/rstudio/ptd/lib/customization" - "github.com/rstudio/ptd/lib/helpers" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" ) // CustomStep represents a custom Go-based Pulumi step defined in a workload's customizations directory diff --git a/lib/steps/eks.go b/lib/steps/eks.go index 6ca3d12..b677637 100644 --- a/lib/steps/eks.go +++ b/lib/steps/eks.go @@ -3,8 +3,8 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type EKSStep struct { diff --git a/lib/steps/helm.go b/lib/steps/helm.go index 5adaeb1..b3d3730 100644 --- a/lib/steps/helm.go +++ b/lib/steps/helm.go @@ -3,8 +3,8 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type HelmStep struct { diff --git a/lib/steps/loader.go b/lib/steps/loader.go index 1914c27..b439bf0 100644 --- a/lib/steps/loader.go +++ b/lib/steps/loader.go @@ -4,7 +4,7 @@ import ( "fmt" "log/slog" - "github.com/rstudio/ptd/lib/customization" + "github.com/posit-dev/ptd/lib/customization" ) // LoadStepsForWorkload loads standard steps and merges in custom steps from manifest if present diff --git a/lib/steps/persistent.go b/lib/steps/persistent.go index ca730d5..70232ba 100644 --- a/lib/steps/persistent.go +++ b/lib/steps/persistent.go @@ -6,9 +6,9 @@ import ( "fmt" "log/slog" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/secrets" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/secrets" + "github.com/posit-dev/ptd/lib/types" ) type PersistentStep struct { diff --git a/lib/steps/persistent_reprise.go b/lib/steps/persistent_reprise.go index 4a377bf..7bfd25c 100644 --- a/lib/steps/persistent_reprise.go +++ b/lib/steps/persistent_reprise.go @@ -2,7 +2,8 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/types" ) type PersistentRepriseStep struct { diff --git a/lib/steps/postgres_config.go b/lib/steps/postgres_config.go index e4ffbed..80359fc 100644 --- a/lib/steps/postgres_config.go +++ b/lib/steps/postgres_config.go @@ -3,8 +3,8 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type PostgresConfigStep struct { diff --git a/lib/steps/selector.go b/lib/steps/selector.go index cff0a90..85bb158 100644 --- a/lib/steps/selector.go +++ b/lib/steps/selector.go @@ -4,7 +4,7 @@ import ( "context" "log/slog" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" ) type selector struct { diff --git a/lib/steps/selector_test.go b/lib/steps/selector_test.go index d2a48ae..acd2643 100644 --- a/lib/steps/selector_test.go +++ b/lib/steps/selector_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/rstudio/ptd/lib/types" - "github.com/rstudio/ptd/lib/types/typestest" + "github.com/posit-dev/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types/typestest" "github.com/stretchr/testify/assert" ) diff --git a/lib/steps/sites.go b/lib/steps/sites.go index a15e7a8..822cdc6 100644 --- a/lib/steps/sites.go +++ b/lib/steps/sites.go @@ -2,8 +2,9 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type SitesStep struct { diff --git a/lib/steps/steps.go b/lib/steps/steps.go index 74bce82..b02c4ad 100644 --- a/lib/steps/steps.go +++ b/lib/steps/steps.go @@ -6,9 +6,9 @@ import ( "log/slog" "slices" + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" "github.com/pulumi/pulumi/sdk/v3/go/auto" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" ) // These aren't the prettiest, but they allow us to easily mock the Pulumi diff --git a/lib/steps/steps_test.go b/lib/steps/steps_test.go index 0086958..f438648 100644 --- a/lib/steps/steps_test.go +++ b/lib/steps/steps_test.go @@ -8,8 +8,8 @@ import ( psdk "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/stretchr/testify/mock" - "github.com/rstudio/ptd/lib/testdata" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/testdata" + "github.com/posit-dev/ptd/lib/types" ) type stepTestHandler struct { diff --git a/lib/steps/workspaces.go b/lib/steps/workspaces.go index 8e04266..091712e 100644 --- a/lib/steps/workspaces.go +++ b/lib/steps/workspaces.go @@ -2,8 +2,9 @@ package steps import ( "context" - "github.com/rstudio/ptd/lib/pulumi" - "github.com/rstudio/ptd/lib/types" + + "github.com/posit-dev/ptd/lib/pulumi" + "github.com/posit-dev/ptd/lib/types" ) type WorkspacesStep struct { diff --git a/lib/types/typestest/testtypes.go b/lib/types/typestest/testtypes.go index f08748a..9f01622 100644 --- a/lib/types/typestest/testtypes.go +++ b/lib/types/typestest/testtypes.go @@ -3,7 +3,7 @@ package typestest import ( "context" - "github.com/rstudio/ptd/lib/types" + "github.com/posit-dev/ptd/lib/types" "github.com/stretchr/testify/mock" ) diff --git a/python-pulumi/pyproject.toml b/python-pulumi/pyproject.toml index c0f9cbd..f9bca03 100644 --- a/python-pulumi/pyproject.toml +++ b/python-pulumi/pyproject.toml @@ -48,10 +48,9 @@ dependencies = [ ] [project.urls] -Documentation = "https://github.com/rstudio/ptd#readme" -Issues = "https://github.com/rstudio/ptd/issues" -Source = "https://github.com/rstudio/ptd" -Kanban = "https://github.com/orgs/rstudio/projects/174/views/1" +Documentation = "https://github.com/posit-dev/ptd#readme" +Issues = "https://github.com/posit-dev/ptd/issues" +Source = "https://github.com/posit-dev/ptd" [dirs.env] virtual = ".venv" diff --git a/python-pulumi/src/ptd/pulumi_resources/trident_operator.py b/python-pulumi/src/ptd/pulumi_resources/trident_operator.py index a07b8ff..1aabd40 100644 --- a/python-pulumi/src/ptd/pulumi_resources/trident_operator.py +++ b/python-pulumi/src/ptd/pulumi_resources/trident_operator.py @@ -34,7 +34,7 @@ def __init__( self.release = release self.workload = workload - # commented out until we resolve: https://github.com/rstudio/ptd/issues/2073 + # commented out until we resolve: https://github.com/posit-dev/ptd/issues/45 # self._define_managed_identity() # self._define_helm_release() # self._define_netapp_backend()