Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename #5

Merged
merged 3 commits into from
Mar 1, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/makefile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
name: Unshallow clone for tags
id: tags
run: |
sudo chown -R $(whoami) /__w/pulumi-aem/pulumi-aem
git config --global --add safe.directory /__w/pulumi-aem/pulumi-aem
sudo chown -R $(whoami) /__w/pulumi-aem-native/pulumi-aem-native
git config --global --add safe.directory /__w/pulumi-aem-native/pulumi-aem-native
git fetch --prune --unshallow --tags
-
name: Build
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ builds:
- linux
ldflags:
# The line below MUST align with the module in current provider/go.mod
- -X github.com/wttech/pulumi-aem/provider/Version={{.Tag }}
- -X github.com/wttech/pulumi-aem-native/provider/Version={{.Tag }}
main: ./cmd/pulumi-resource-aem/
changelog:
skip: true
Expand Down
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PROJECT_NAME := Pulumi AEM Compose Provider
PACK := aem
MOD := compose
PACKDIR := sdk
PROJECT := github.com/wttech/pulumi-aem
PROJECT := github.com/wttech/pulumi-aem-native
NODE_MODULE_NAME := @wttech/aem
NUGET_PKG_NAME := Pulumi.Aem

Expand Down Expand Up @@ -43,10 +43,12 @@ dotnet_sdk::
go_sdk:: $(WORKING_DIR)/bin/$(PROVIDER)
rm -rf sdk/go
pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language go
sed -i.bak 's/"internal"/"github.com\/wttech\/pulumi-aem\/sdk\/go\/aem\/internal"/g' sdk/go/$(PACK)/*.go
sed -i.bak 's/"internal"/"github.com\/wttech\/pulumi-aem\/sdk\/go\/aem\/internal"/g' sdk/go/$(PACK)/$(MOD)/*.go
sed -i.bak 's/"internal"/"github.com\/wttech\/pulumi-aem-native\/sdk\/go\/aem\/internal"/g' sdk/go/$(PACK)/*.go
sed -i.bak 's/"internal"/"github.com\/wttech\/pulumi-aem-native\/sdk\/go\/aem\/internal"/g' sdk/go/$(PACK)/$(MOD)/*.go
sed -i.bak 's/\/pulumi-aem\/sdk/\/pulumi-aem-native\/sdk/g' sdk/go/$(PACK)/internal/*.go
rm ./sdk/go/$(PACK)/*.go.bak
rm ./sdk/go/$(PACK)/$(MOD)/*.go.bak
rm ./sdk/go/$(PACK)/internal/*.go.bak

nodejs_sdk:: VERSION := $(shell pulumictl get version --language javascript)
nodejs_sdk::
Expand Down
2 changes: 1 addition & 1 deletion deployment-templates/.goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ builds:
- linux
ldflags:
# The line below MUST align with the module in current provider/go.mod
- -X github.com/wttech/pulumi-aem/provider/Version={{.Tag }}
- -X github.com/wttech/pulumi-aem-native/provider/Version={{.Tag }}
main: ./cmd/pulumi-resource-aem/
changelog:
skip: true
Expand Down
6 changes: 3 additions & 3 deletions docs/resources/instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ If you need to set up multiple AEM instances on multiple machines, you can use t

Consider reviewing the following examples to find the one that best suits your needs:

1. [AWS EC2 instance with public IP](https://github.com/wttech/pulumi-aem/tree/main/examples/go_aws_ssh)
2. [AWS EC2 instance with private IP](https://github.com/wttech/pulumi-aem/tree/main/examples/go_aws_ssm)
3. [Bare metal machine](https://github.com/wttech/pulumi-aem/tree/main/examples/go_bare_metal)
1. [AWS EC2 instance with public IP](https://github.com/wttech/pulumi-aem-native/tree/main/examples/go_aws_ssh)
2. [AWS EC2 instance with private IP](https://github.com/wttech/pulumi-aem-native/tree/main/examples/go_aws_ssm)
3. [Bare metal machine](https://github.com/wttech/pulumi-aem-native/tree/main/examples/go_bare_metal)



Expand Down
2 changes: 1 addition & 1 deletion examples/go_aws_ssh/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pulumi-aem
name: pulumi-aem-native
runtime: go
plugins:
providers:
Expand Down
6 changes: 3 additions & 3 deletions examples/go_aws_ssh/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/wttech/pulumi-aem/examples/go_aws_ssh
module github.com/wttech/pulumi-aem-native/examples/go_aws_ssh

go 1.21

replace github.com/wttech/pulumi-aem/sdk => ../../sdk
replace github.com/wttech/pulumi-aem-native/sdk => ../../sdk

require (
github.com/pulumi/pulumi-aws/sdk/v6 v6.21.0
github.com/pulumi/pulumi/sdk/v3 v3.104.2
github.com/wttech/pulumi-aem/sdk v0.0.0-20240207010449-6e972a29045f
github.com/wttech/pulumi-aem-native/sdk v0.0.0-20240207010449-6e972a29045f
)

require (
Expand Down
2 changes: 1 addition & 1 deletion examples/go_aws_ssh/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2"
"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
"github.com/wttech/pulumi-aem/sdk/go/aem/compose"
"github.com/wttech/pulumi-aem-native/sdk/go/aem/compose"
)

//go:embed aem.yml
Expand Down
2 changes: 1 addition & 1 deletion examples/go_aws_ssm/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pulumi-aem
name: pulumi-aem-native
runtime: go
plugins:
providers:
Expand Down
6 changes: 3 additions & 3 deletions examples/go_aws_ssm/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/wttech/pulumi-aem/examples/go_aws_ssm
module github.com/wttech/pulumi-aem-native/examples/go_aws_ssm

go 1.21

replace github.com/wttech/pulumi-aem/sdk => ../../sdk
replace github.com/wttech/pulumi-aem-native/sdk => ../../sdk

require (
github.com/pulumi/pulumi-aws/sdk/v6 v6.21.0
github.com/pulumi/pulumi/sdk/v3 v3.104.2
github.com/wttech/pulumi-aem/sdk v0.0.0-20240207010449-6e972a29045f
github.com/wttech/pulumi-aem-native/sdk v0.0.0-20240207010449-6e972a29045f
)

require (
Expand Down
2 changes: 1 addition & 1 deletion examples/go_aws_ssm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2"
"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
"github.com/wttech/pulumi-aem/sdk/go/aem/compose"
"github.com/wttech/pulumi-aem-native/sdk/go/aem/compose"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/go_bare_metal/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pulumi-aem
name: pulumi-aem-native
runtime: go
plugins:
providers:
Expand Down
6 changes: 3 additions & 3 deletions examples/go_bare_metal/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/wttech/pulumi-aem/examples/go_aws_ssh
module github.com/wttech/pulumi-aem-native/examples/go_aws_ssh

go 1.21

replace github.com/wttech/pulumi-aem/sdk => ../../sdk
replace github.com/wttech/pulumi-aem-native/sdk => ../../sdk

require (
github.com/pulumi/pulumi/sdk/v3 v3.104.2
github.com/wttech/pulumi-aem/sdk v0.0.0-20240207010449-6e972a29045f
github.com/wttech/pulumi-aem-native/sdk v0.0.0-20240207010449-6e972a29045f
)

require (
Expand Down
Loading