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 .github/workflows/go-version-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,6 @@ jobs:

${{ matrix.env.module }}

<sub>Created by the [`update-go-version` GitHub Actions workflow](https://github.com/rstudio/ptd/actions/workflows/update-go-version.yml).</sub>
<sub>Created by the [`go-version-update` GitHub Actions workflow](https://github.com/posit-dev/ptd/actions/workflows/go-version-update.yml).</sub>
branch: bump-${{ matrix.env.group }}-go-toolchain-to-${{ steps.latest.outputs.version }}
labels: dependencies
10 changes: 5 additions & 5 deletions cmd/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/assume.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/ensure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/internal/legacy/ptd_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/k9s.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions cmd/proxy.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/workon.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
20 changes: 10 additions & 10 deletions docs/cli/custom-steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -149,7 +149,7 @@ customizations/

```bash
cd customizations/my-step
go mod init github.com/rstudio/ptd/workloads/<workload>/my-step
go mod init github.com/posit-dev/ptd/workloads/<workload>/my-step

# Add Pulumi dependencies
go get github.com/pulumi/pulumi/sdk/v3@latest
Expand Down Expand Up @@ -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
```
Expand All @@ -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

Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions examples/custom-steps/simple-s3-bucket/go.mod
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/custom-steps/simple-s3-bucket/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 6 additions & 5 deletions lib/aws/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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$`)
Expand Down
4 changes: 2 additions & 2 deletions lib/aws/ecr.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/aws/iam.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion lib/aws/kms.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lib/aws/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
3 changes: 2 additions & 1 deletion lib/aws/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/aws/secretsmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions lib/aws/secretstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions lib/aws/target.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/aws/target_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
5 changes: 3 additions & 2 deletions lib/azure/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading