Skip to content

Commit

Permalink
[SRE-398] Package rename
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeCarrier committed Apr 6, 2023
1 parent 398e084 commit 6d99976
Show file tree
Hide file tree
Showing 63 changed files with 110 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive

ARG TERRAFORM_VERSION=0.12.28
ARG TFLINT_VERSION=0.15.3
ARG TERRAFORM_PROVIDER_AZUREDEVOPS_NAME=terraform-provider-azuredevops
ARG TERRAFORM_PROVIDER_AZUREDEVOPS_NAME=terraform-provider-bblnazuredevops

RUN apt-get update \
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Bug_Report.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you are running into one of these scenarios, we recommend opening an issue in

<!--- Please list the affected resources and data sources. --->

* `azuredevops_XXXXX`
* `bblnazuredevops_XXXXX`

### Terraform Configuration Files

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Feature_Request.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ about: I have a suggestion (and might want to implement myself 🙂)!

<!--- Please list the new or affected resources and data sources. --->

* azuredevops_XXXXX
* `bblnazuredevops_XXXXX`

### Potential Terraform Configuration

Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ dist
# OS
.DS_Store

# Babylon build
terraform-provider-azuredevops
# Build
terraform-provider-bblnazuredevops
babylon/terraform.d
4 changes: 2 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ archives:
checksum:
name_template: 'checksums.txt'
snapshot:
name_template: "terraform-provider-azuredevops"
name_template: "terraform-provider-bblnazuredevops"
changelog:
sort: asc
filters:
Expand All @@ -24,5 +24,5 @@ changelog:
- '^test:'
release:
github:
owner: microsoft
owner: babylonhealth
name: terraform-provider-azuredevops
26 changes: 13 additions & 13 deletions .vscode/terraform.code-snippets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
// Place your terraform-provider-azuredevops workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// Place your terraform-provider-bblnazuredevops workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
Expand All @@ -19,7 +19,7 @@
"scope": "go",
"prefix": "tf-azdo-rs",
"body": [
"package azuredevops",
"package bblnazuredevops",
"",
"import (",
" \"fmt\"",
Expand All @@ -28,9 +28,9 @@
" \"github.com/hashicorp/terraform-plugin-sdk/helper/validation\"",
"",
" \"github.com/microsoft/azure-devops-go-api/azuredevops/core\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/validate\"",
" \"github.com/babylonhealth/terraform-provider-azuredevops/bblnazuredevops/internal/client\"",
" \"github.com/babylonhealth/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter\"",
" \"github.com/babylonhealth/terraform-provider-azuredevops/bblnazuredevops/internal/utils/validate\"",
")",
"",
"func resource${1}() *schema.Resource {",
Expand Down Expand Up @@ -72,7 +72,7 @@
"scope": "go",
"prefix": "tf-azdo-ds",
"body": [
"package azuredevops",
"package bblnazuredevops",
"",
"import (",
" \"fmt\"",
Expand All @@ -81,9 +81,9 @@
" \"github.com/hashicorp/terraform-plugin-sdk/helper/validation\"",
"",
" \"github.com/microsoft/azure-devops-go-api/azuredevops/core\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/validate\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azuredevops/internal/client\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azuredevops/internal/utils/converter\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azuredevops/internal/utils/validate\"",
")",
"",
"func dataSource${1}() *schema.Resource {",
Expand Down Expand Up @@ -121,7 +121,7 @@
"body": [
"// +build all",
"",
"package azuredevops",
"package bblnazuredevops",
"",
"// The tests in this file use the mock clients in mock_client.go to mock out",
"// the Azure DevOps client operations.",
Expand All @@ -132,9 +132,9 @@
" \"fmt\"",
" \"testing\"",
"",
" \"github.com/microsoft/terraform-provider-azuredevops/azdosdkmocks\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client\"",
" \"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azdosdkmocks\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azuredevops/internal/client\"",
" \"github.com/babylonhealth/terraform-provider-bblnazuredevops/azuredevops/internal/utils/converter\"",
"",
" \"github.com/golang/mock/gomock\"",
" \"github.com/google/uuid\"",
Expand Down
4 changes: 2 additions & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TEST?=$$(go list ./azuredevops/internal/acceptancetests |grep -v 'vendor')
TEST?=$$(go list ./bblnazuredevops/internal/acceptancetests | grep -v 'vendor')
UNITTEST?=$$(go list ./... |grep -v 'vendor')
WEBSITE_REPO=github.com/hashicorp/terraform-website
PKG_NAME=azuredevops
PKG_NAME=bblnazuredevops
TESTTIMEOUT=180m
TESTTAGS=all

Expand Down
2 changes: 1 addition & 1 deletion PROVIDER_NAME.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
azuredevops
bblnazuredevops
2 changes: 1 addition & 1 deletion babylon/Dockerfile.semver
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ ARG SEMVER_VERSION

RUN \
set -eux \
&& cd /usr/local/share/terraform/plugins/babylonhealth.com/babylonhealth/azuredevops/ \
&& cd /usr/local/share/terraform/plugins/babylonhealth.com/babylonhealth/bblnazuredevops/ \
&& mv "$(ls -1 | grep -v index.json)" "${SEMVER_VERSION}" \
&& chmod -R go+rx /usr/local/share/terraform
4 changes: 2 additions & 2 deletions babylon/build
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
set -exo pipefail

CONTAINER_NAME=quay.io/babylonhealth/azure-terraform
BINARY_NAME=terraform-provider-azuredevops
BINARY_NAME=terraform-provider-bblnazuredevops

SHA_VERSION=${CIRCLE_SHA1:-latest}
SEMVER_VERSION="$(git describe --abbrev=0 --tags --match '*-babylon*' | sed -E -e 's/^v//' || echo unknown)"

PROVIDER_NAME=azuredevops
PROVIDER_NAME=bblnazuredevops
PLUGIN_DIR="babylon/terraform.d/plugins/babylonhealth.com/babylonhealth/${PROVIDER_NAME}/${SEMVER_VERSION}/linux_amd64"


Expand Down
19 changes: 0 additions & 19 deletions babylon/sync-origin

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"context"
"fmt"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/githubapp/githubappclient"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/githubapp/githubappclient"
"log"
"os"
"strings"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"bytes"
"encoding/json"
"fmt"
exclusivelockmodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/exclusivelock/model"
invokerestapimodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/invokerestapi/model"
manualapprovalmodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/manualapproval/model"
exclusivelockmodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/exclusivelock/model"
invokerestapimodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/invokerestapi/model"
manualapprovalmodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/manualapproval/model"
"github.com/sirupsen/logrus"
"io/ioutil"
"net/http"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"fmt"
"github.com/google/go-cmp/cmp"
exclusivelockmodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/exclusivelock/model"
invokerestapimodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/invokerestapi/model"
manualapprovalmodel "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/manualapproval/model"
exclusivelockmodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/exclusivelock/model"
invokerestapimodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/invokerestapi/model"
manualapprovalmodel "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/manualapproval/model"
"github.com/sirupsen/logrus"
"net/http"
"net/http/httptest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resource
import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/invokerestapi/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/invokerestapi/model"
"strconv"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package model

import (
"encoding/json"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/model"
"github.com/sirupsen/logrus"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package resource
import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/exclusivelock/model"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/tfhelper"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/exclusivelock/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/tfhelper"
"strconv"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package model

import (
"encoding/json"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/model"
"log"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"encoding/json"
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/invokerestapi/model"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/tfhelper"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/invokerestapi/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/tfhelper"
"strconv"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package model

import (
"encoding/json"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/model"
"github.com/sirupsen/logrus"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/checks/manualapproval/model"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/tfhelper"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/common/resource"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/checks/manualapproval/model"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/tfhelper"
"strconv"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package githubapp
import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/tfhelper"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/tfhelper"
)

func ResourceGithubApp() *schema.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
securityhelper "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/service/permissions/utils"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
securityhelper "github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/service/permissions/utils"
"log"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package utils
import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/suppress"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/suppress"
)

// CreatePermissionResourceSchema creates a resources schema for a Terraform permission resource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ahmetb/go-linq"
"github.com/microsoft/azure-devops-go-api/azuredevops/workitemtracking"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter"
)

const aclClassificationNodeTokenPrefix = "vstfs:///Classification/Node/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/google/uuid"
"github.com/microsoft/azure-devops-go-api/azuredevops/workitemtracking"
"github.com/microsoft/terraform-provider-azuredevops/azdosdkmocks"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter"
"github.com/stretchr/testify/assert"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/azure-devops-go-api/azuredevops/identity"
"github.com/microsoft/azure-devops-go-api/azuredevops/security"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter"
)

// ActionName type for an permission actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"github.com/microsoft/azure-devops-go-api/azuredevops/identity"
"github.com/microsoft/azure-devops-go-api/azuredevops/security"
"github.com/microsoft/terraform-provider-azuredevops/azdosdkmocks"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/testhelper"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/client"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/testhelper"
"github.com/stretchr/testify/assert"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/utils/converter"
"github.com/microsoft/terraform-provider-azuredevops/bblnazuredevops/internal/utils/converter"
)

// SetPrincipalPermissions sets permissions for a specific security namespac
Expand Down
Loading

0 comments on commit 6d99976

Please sign in to comment.