Skip to content

Commit

Permalink
Fix issues in Azure SQL branch (#170)
Browse files Browse the repository at this point in the history
* feat: implement keyvault controller

* Ace's KV changes with updates

* Added an event for the final successful provisioning

* Updated changes based on the PR comments

* removing unwanted file

* making resource group name the one in the keyvault yaml

* need to handled unexpected error types...like validation.error (#111)

* refactor tests  (#90)

* improve tests with parallel execution and rm sleep

* fix the tests to run on kindcluster

* Updates to KV controller from Ace (#80) (#112)

* feat: implement keyvault controller

* Ace's KV changes with updates

* Added an event for the final successful provisioning

* Updated changes based on the PR comments

* removing unwanted file

* making resource group name the one in the keyvault yaml

Co-authored-by: Ace Eldeib <alexeldeib@gmail.com>

* Test update (#115)

* this needs to exist in the reconciler in order to use controllerutil createorupdate

* Feat/add consumer group kind (#117)

* add consumer group kind

* update tests for consumer group

* fix isbeingdeleted

* Updates to README - steps for onboarding (#114)

* cluster additions

* updated docs

* Update azure-pipelines.yaml (#119)

* Update azure-pipelines.yaml

* fix tests (#140)

* revert back // +kubebuilder:subresource:status changes - fix broken tests

* Devcontainer to Help Onboard New People (#142)

* add dev conatiner - wip

* DevContainer up and running.

* Removed `sleep 80` and replaced with `kubectl wait`.

* Run `make set-kindcluster` from docker-compose.

* Set timeout on wait.

* Added `install-test-dependency` to makefile and dockerfile.

* Update README - Create SP with contribution rights.

* Updated README with details on using devcontainer.

* Stuff that wanted me to commit.

* Reverted changes made to `docker-build` in Makefile.

* pass future where possible instead of bool (#121)

* first commit on Amanda's branch

* first

* before properties

* test not tested

* test works

* unit tests work, needs firewall rules

* addresses feedback

* erin's feedback

* janani's change, pass future

* async works much better now

* janani feedback

* screwed up interface prototype

* randomize the resources names used in tests (#152)

* Ability to Set SecretName When Creating Event Hub (#151)

* Updated eventhub_types - Added `secretName`.

* Added `secretName` to sample manifest.

* Set secret name to `secretName` if set, otherwise use eventhub name.

* Updated Makefile to update Azure Operator.

Also added the ability to rebuild image without cache.

* Updated README on how to update the Azure Operator.

* Updated CRD with SecretName description.

* Added tests to ensure `SecretName` was being used if present.

* Fix test.

* merging

* fixed issues with merge conflict
 Please enter the commit message for your changes. Lines starting

* fixing merge conflict markers in role yaml

* removing file

* Fixed issues in the SDK library to take location from the spec instead of config  and the error library.
 Please enter the commit message for your changes. Lines starting
  • Loading branch information
jananivMS authored Aug 30, 2019
1 parent 054ee64 commit 0a26b4d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions pkg/errhelp/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ const (
)

func NewAzureError(err error) error {

if err == nil {
return nil
}
ae := AzureError{
Original: err,
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/resourcemanager/sqlclient/sqlclient_godsk.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (sdk GoSDKClient) CreateOrUpdateSQLServer(properties SQLServerProperties) (
sdk.ResourceGroupName,
sdk.ServerName,
sql.Server{
Location: to.StringPtr(config.Location()),
Location: to.StringPtr(sdk.Location),
ServerProperties: &serverProp,
})
if err != nil {
Expand Down Expand Up @@ -257,7 +257,7 @@ func (sdk GoSDKClient) GetServer(rgroup, name string) (sql.Server, error) {

return serversClient.Get(
sdk.Ctx,
sdk.ResourceGroupName,
sdk.ServerName,
rgroup,
name,
)
}

0 comments on commit 0a26b4d

Please sign in to comment.