Skip to content

Commit

Permalink
fix: 🐛 fix git org reference
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-pip committed Mar 11, 2024
1 parent f512285 commit 5500ade
Show file tree
Hide file tree
Showing 43 changed files with 85 additions and 77 deletions.
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/ryan.pip/pulumi-astronomer/provider/pkg/version.Version={{.Tag }}
- -X github.com/ryan-pip/pulumi-astronomer/provider/pkg/version.Version={{.Tag }}
main: ./cmd/pulumi-resource-astronomer/
changelog:
skip: true
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
SHELL := /bin/bash
PROJECT := github.com/ryan.pip/pulumi-astronomer
PROJECT := github.com/ryan-pip/pulumi-astronomer
NODE_MODULE_NAME := @ryan-pip/pulumi_astronomer
TF_NAME := astronomer
PROVIDER_PATH := provider
Expand Down
2 changes: 1 addition & 1 deletion README-DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ section of the code where we construct a `tfbridge.ProviderInfo` object:


```go
GitHubOrg: "ryan.pip",
GitHubOrg: "ryan-pip",
```

1. **Add provider configuration overrides (not typically needed):** Pulumi's
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Astronomer Resource Provider

The Astronomer Resource Provider lets you manage [astronomer](https://www.pulumi.com/registry/packages/astronomer/) resources.
The Astronomer Resource Provider lets you manage [astronomer](https://www.pulumi.com/registry/packages/astronomer/) resources as
part of the [Astronomer Cloud](https://www.astronomer.io/).

This provider is a bridged version of the [terraform provider](https://registry.terraform.io/providers/GK-Consulting/astronomer/latest/docs/resources/workspace). The
majority of the credit needs to go to the original [authors](https://github.com/GK-Consulting/terraform-provider-astronomer) of the terraform provider.

## Installing

Expand Down Expand Up @@ -33,7 +37,7 @@ pip install pulumi-astronomer
To use from Go, use `go get` to grab the latest version of the library:

```bash
go get github.com/ryan.pip/pulumi-astronomer/sdk/go/...
go get github.com/ryan-pip/pulumi-astronomer/sdk/go/...
```

### .NET (ToD0)
Expand Down
2 changes: 1 addition & 1 deletion docs/installation-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The Pulumi Astronomer provider is available as a package in all Pulumi languages

* JavaScript/TypeScript: [`@ryan-pip/pulumi_astronomer`](https://www.npmjs.com/package/@ryan-pip/pulumi_astronomer)
* Python: [`pulumi_astronomer`](https://pypi.org/project/pulumi_astronomer/)
* Go: [`github.com/ryan.pip/pulumi-astronomer/sdk/go/astronomer`](https://pkg.go.dev/github.com/ryan.pip/pulumi-astronomer/sdk/go/astronomer)
* Go: [`github.com/ryan-pip/pulumi-astronomer/sdk/go/astronomer`](https://pkg.go.dev/github.com/ryan-pip/pulumi-astronomer/sdk/go/astronomer)
* .NET: [`RyanPip.Astronomer`](https://www.nuget.org/packages/RyanPip.Astronomer)


Expand Down
2 changes: 1 addition & 1 deletion provider/cmd/pulumi-resource-astronomer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
_ "embed"

"github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
astronomer "github.com/ryan.pip/pulumi-astronomer/provider"
astronomer "github.com/ryan-pip/pulumi-astronomer/provider"
)

//go:embed schema-embed.json
Expand Down
28 changes: 14 additions & 14 deletions provider/cmd/pulumi-resource-astronomer/schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provider/cmd/pulumi-tfgen-astronomer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package main

import (
astronomer "github.com/ryan.pip/pulumi-astronomer/provider"
"github.com/pulumi/pulumi-terraform-bridge/pf/tfgen"
astronomer "github.com/ryan-pip/pulumi-astronomer/provider"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ryan.pip/pulumi-astronomer/provider
module github.com/ryan-pip/pulumi-astronomer/provider

go 1.21.5

Expand Down
16 changes: 8 additions & 8 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/ryan.pip/pulumi-astronomer/provider/pkg/version"
"github.com/ryan-pip/pulumi-astronomer/provider/pkg/version"
)

//go:embed cmd/pulumi-resource-astronomer/bridge-metadata.json
Expand Down Expand Up @@ -99,17 +99,17 @@ func Provider() tfbridge.ProviderInfo {
// Change this to your personal name (or a company name) that you
// would like to be shown in the Pulumi Registry if this package is published
// there.
Publisher: "ryan.pip",
Publisher: "ryan-pip",
// LogoURL is optional but useful to help identify your package in the Pulumi Registry
// if this package is published there.
//
// You may host a logo on a domain you control or add an SVG logo for your package
// in your repository and use the raw content URL for that file as your logo URL.
LogoURL: "https://raw.githubusercontent.com/ryan.pip/pulumi-astronomer/main/docs/astronomer.svg",
LogoURL: "https://raw.githubusercontent.com/ryan-pip/pulumi-astronomer/main/docs/astronomer.svg",
// PluginDownloadURL is an optional URL used to download the Provider
// for use in Pulumi programs
// e.g https://github.com/org/pulumi-provider-name/releases/
PluginDownloadURL: "github://api.github.com/ryan.pip/pulumi-astronomer",
PluginDownloadURL: "github://api.github.com/ryan-pip/pulumi-astronomer",
Description: "A Pulumi package for creating and managing Astronomer Cloud resources",
// category/cloud tag helps with categorizing the package in the Pulumi Registry.
// For all available categories, see `Keywords` in
Expand All @@ -120,8 +120,8 @@ func Provider() tfbridge.ProviderInfo {
"category/infrastructure",
},
License: "Apache-2.0",
Homepage: "https://github.com/ryan.pip/pulumi-astronomer",
Repository: "https://github.com/ryan.pip/pulumi-astronomer",
Homepage: "https://github.com/ryan-pip/pulumi-astronomer",
Repository: "https://github.com/ryan-pip/pulumi-astronomer",
// The GitHub Org for the provider - defaults to `terraform-providers`. Note that this
// should match the TF provider module's require directive, not any replace directives.
Version: version.Version,
Expand Down Expand Up @@ -180,7 +180,7 @@ func Provider() tfbridge.ProviderInfo {
},
Golang: &tfbridge.GolangInfo{
ImportBasePath: filepath.Join(
fmt.Sprintf("github.com/ryan.pip/pulumi-%[1]s/sdk/", "astronomer"),
fmt.Sprintf("github.com/ryan-pip/pulumi-%[1]s/sdk/", "astronomer"),
tfbridge.GetModuleMajorVersion(version.Version),
"go",
"astronomer",
Expand All @@ -195,7 +195,7 @@ func Provider() tfbridge.ProviderInfo {
},
},
Java: &tfbridge.JavaInfo{
BasePackage: "com.ryan.pip",
BasePackage: "com.ryan-pip",
},
}

Expand Down
2 changes: 1 addition & 1 deletion provider/shim/shim.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package shim
import (
"github.com/GK-Consulting/terraform-provider-astronomer/internal/provider"
tf "github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/ryan.pip/pulumi-astronomer/provider/pkg/version"
"github.com/ryan-pip/pulumi-astronomer/provider/pkg/version"
)

func NewProvider() tf.Provider {
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Cluster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
PluginDownloadURL = "github://api.github.com/ryan.pip/pulumi-astronomer",
PluginDownloadURL = "github://api.github.com/ryan-pip/pulumi-astronomer",
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
// Override the ID if one was specified for consistency with other language SDKs.
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Deployment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
PluginDownloadURL = "github://api.github.com/ryan.pip/pulumi-astronomer",
PluginDownloadURL = "github://api.github.com/ryan-pip/pulumi-astronomer",
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
// Override the ID if one was specified for consistency with other language SDKs.
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Provider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
PluginDownloadURL = "github://api.github.com/ryan.pip/pulumi-astronomer",
PluginDownloadURL = "github://api.github.com/ryan-pip/pulumi-astronomer",
AdditionalSecretOutputs =
{
"token",
Expand Down
8 changes: 4 additions & 4 deletions sdk/dotnet/RyanPip.Astronomer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>ryan.pip</Authors>
<Company>ryan.pip</Company>
<Authors>ryan-pip</Authors>
<Company>ryan-pip</Company>
<Description>A Pulumi package for creating and managing Astronomer Cloud resources</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/ryan.pip/pulumi-astronomer</PackageProjectUrl>
<RepositoryUrl>https://github.com/ryan.pip/pulumi-astronomer</RepositoryUrl>
<PackageProjectUrl>https://github.com/ryan-pip/pulumi-astronomer</PackageProjectUrl>
<RepositoryUrl>https://github.com/ryan-pip/pulumi-astronomer</RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Utilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static class Utilities
{
var dst = src ?? new global::Pulumi.InvokeOptions{};
dst.Version = src?.Version ?? Version;
dst.PluginDownloadURL = src?.PluginDownloadURL ?? "github://api.github.com/ryan.pip/pulumi-astronomer";
dst.PluginDownloadURL = src?.PluginDownloadURL ?? "github://api.github.com/ryan-pip/pulumi-astronomer";
return dst;
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Workspace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
PluginDownloadURL = "github://api.github.com/ryan.pip/pulumi-astronomer",
PluginDownloadURL = "github://api.github.com/ryan-pip/pulumi-astronomer",
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
// Override the ID if one was specified for consistency with other language SDKs.
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/pulumi-plugin.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"resource": true,
"name": "astronomer",
"server": "github://api.github.com/ryan.pip/pulumi-astronomer"
"server": "github://api.github.com/ryan-pip/pulumi-astronomer"
}
2 changes: 1 addition & 1 deletion sdk/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ryan.pip/pulumi-astronomer/sdk
module github.com/ryan-pip/pulumi-astronomer/sdk

go 1.21

Expand Down
4 changes: 2 additions & 2 deletions sdk/go/astronomer/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/config/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/deployment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/astronomer/getCluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/getDeployment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/astronomer/getOrganization.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/astronomer/getWorkspace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/init.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/astronomer/internal/pulumiUtilities.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/provider.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/go/astronomer/pulumi-plugin.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"resource": true,
"name": "astronomer",
"server": "github://api.github.com/ryan.pip/pulumi-astronomer"
"server": "github://api.github.com/ryan-pip/pulumi-astronomer"
}
2 changes: 1 addition & 1 deletion sdk/go/astronomer/pulumiTypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/astronomer/workspace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/nodejs/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> This provider is a derived work of the [Terraform Provider](https://github.com/GK-Consulting/terraform-provider-astronomer)
> distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,
> first check the [`pulumi-astronomer` repo](https://github.com/ryan.pip/pulumi-astronomer/issues); however, if that doesn't turn up anything,
> first check the [`pulumi-astronomer` repo](https://github.com/ryan-pip/pulumi-astronomer/issues); however, if that doesn't turn up anything,
> please consult the source [`terraform-provider-astronomer` repo](https://github.com/GK-Consulting/terraform-provider-astronomer/issues).
Loading

0 comments on commit 5500ade

Please sign in to comment.