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

provider/azurerm: Add example of azure search create #14340

Merged
merged 87 commits into from
May 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
9f0d990
initial commit - 101-vm-from-user-image
anniehedgpeth Apr 18, 2017
6f577a8
changed branch name
anniehedgpeth Apr 19, 2017
611d70a
not deploying - storage problems
anniehedgpeth Apr 21, 2017
fdff23a
provisions vm but image not properly prepared
anniehedgpeth Apr 21, 2017
0dac5ec
storage not correct
anniehedgpeth Apr 21, 2017
81e2559
provisions properly
anniehedgpeth Apr 22, 2017
7dc8150
changed main.tf to azuredeploy.tf
anniehedgpeth Apr 22, 2017
5c079fa
added tfvars and info for README
anniehedgpeth Apr 22, 2017
c86ef6f
tfvars ignored and corrected file ext
anniehedgpeth Apr 22, 2017
534b236
added CI config; added sane defaults for variables; updated deploymen…
Apr 24, 2017
0cf888b
deploy.sh to be executable
Apr 24, 2017
68f0003
executable deploy files
Apr 24, 2017
c898510
added CI files; changed vars
anniehedgpeth Apr 25, 2017
9d1541c
merge upstream/master
Apr 25, 2017
5c8ecd8
prep for PR
Apr 25, 2017
0267fca
removal of old folder
Apr 25, 2017
f9bf6ba
prep for PR
Apr 25, 2017
cec0679
wrong args for travis
Apr 25, 2017
d78e8bd
more PR prep
Apr 26, 2017
6bf2df2
updated README
anniehedgpeth Apr 26, 2017
b22cff0
commented out variables in terraform.tfvars
Apr 26, 2017
09175de
Merge branch 'topic-101-vm-from-user-image' of https://github.com/10t…
anniehedgpeth Apr 26, 2017
0843f45
Topic 101 vm from user image (#2)
scottzilla Apr 26, 2017
49caea5
added new template
Apr 26, 2017
2236828
oops, left off master
Apr 26, 2017
27167b5
Merge branch 'master' of github.com:harijayms/terraform
Apr 26, 2017
5b8f7bb
merge upstream; prep for PR
Apr 26, 2017
7f8fe25
prep for PR
Apr 27, 2017
eecb2d2
correct repository for destination
Apr 27, 2017
92e341d
renamed scripts to be more intuitive; added check for docker
Apr 27, 2017
23627c8
merge vm simple; vm from image
Apr 27, 2017
0fdf4cb
merge upstream
Apr 27, 2017
ac2e5c2
initial commit
anniehedgpeth Apr 27, 2017
935c19a
deploys locally
anniehedgpeth Apr 27, 2017
66b7441
updated deploy
anniehedgpeth Apr 27, 2017
c98b1d1
consolidated deploy and after_deploy into a single script; simplified…
Apr 27, 2017
0ef07bc
added terraform show
Apr 27, 2017
50e8d8a
changed to allow http & https (like ARM tmplt)
anniehedgpeth Apr 27, 2017
ace9b0b
changed host_name & host_name variable desc
anniehedgpeth Apr 27, 2017
5e99f81
added az cli check
Apr 28, 2017
ce1f573
merge upstream master
Apr 28, 2017
65826c1
on this branch, only build test_dir; master will aggregate all the ex…
Apr 28, 2017
2675c55
merge master
Apr 28, 2017
072a51a
added new constructs/naming for deploy scripts, etc.
Apr 28, 2017
06f1a7f
suppress az login output
Apr 28, 2017
3523ed3
suppress az login output
Apr 28, 2017
21837a9
forgot about line breaks
Apr 28, 2017
e1e3aa2
breaking build as an example
Apr 28, 2017
a0a7643
fixing broken build example
Apr 28, 2017
fd0231b
added cdn branch; ci uses running vm to test
anniehedgpeth Apr 28, 2017
02bfac9
Merge remote-tracking branch 'origin' into topic-101-vnet-two-subnets
Apr 28, 2017
74c4f6c
Merge branch 'topic-101-vnet-two-subnets'
anniehedgpeth May 1, 2017
2c02115
merge of CI config
anniehedgpeth May 1, 2017
487d9cd
fixed grammar in readme
May 1, 2017
d8ef7b1
prep for PR
May 1, 2017
25ef50c
took out armviz button and minor README changes
anniehedgpeth May 2, 2017
63c494d
changed host_name
anniehedgpeth May 2, 2017
9a5a15a
fixed merge conflicts
anniehedgpeth May 2, 2017
d821717
Sync with upstream
StephenWeatherford May 2, 2017
d7e2acb
changed host_name variable
anniehedgpeth May 2, 2017
dbaf8d1
updating Hashicorp's changes to merged simple linux branch
anniehedgpeth May 3, 2017
b850cd5
updating files to merge w/master and prep for Hashicorp pr
anniehedgpeth May 3, 2017
a6151bc
Revert "updating files to merge w/master and prep for Hashicorp pr"
anniehedgpeth May 3, 2017
5426739
Revert "updating Hashicorp's changes to merged simple linux branch"
anniehedgpeth May 3, 2017
9b809ac
Merge branch 'master' into topic-201-cdn-with-storage-account
anniehedgpeth May 3, 2017
5174369
removing vm from user image example from this branch
anniehedgpeth May 4, 2017
007ea39
Merge branch 'master' into topic-101-vm-from-user-image
anniehedgpeth May 4, 2017
f6c13d4
Merge pull request #10 from 10thmagnitude/topic-101-vm-from-user-image
anniehedgpeth May 4, 2017
1366980
removed old branch
anniehedgpeth May 4, 2017
6d09c47
initial commit - azure search create
anniehedgpeth May 5, 2017
8e91c7e
removing graph from README
anniehedgpeth May 5, 2017
6a1813e
azure-2-vms-loadbalancer-lbrules (#13)
scottzilla May 5, 2017
b9e53f8
merged hari/master
anniehedgpeth May 8, 2017
888b578
add CI build tag
scottzilla May 8, 2017
453779f
updated .travis.yml to have the correct branch; validated resource wi…
May 8, 2017
358610d
deleted commented out item in deploy script
anniehedgpeth May 10, 2017
a0b4cad
azure-traffic-manager-vm (#17)
anniehedgpeth May 10, 2017
a49a48a
azure-vnet-to-vnet-peering (#20)
anniehedgpeth May 10, 2017
da727c2
returning .travis.yml to correct state
anniehedgpeth May 10, 2017
65becc7
Merge branch 'master' into topic-101-azure-search-create
anniehedgpeth May 10, 2017
2830b24
correcting .travis.yml
anniehedgpeth May 10, 2017
83641a7
merging with master
anniehedgpeth May 10, 2017
fc50f98
Merge branch 'topic-101-azure-search-create' of https://github.com/ha…
anniehedgpeth May 10, 2017
c6d8a9c
merging Hashicorp master into this branch
anniehedgpeth May 10, 2017
235f6da
merging Hashicorp master into this branch
anniehedgpeth May 10, 2017
4889c00
removing unmerged example
anniehedgpeth May 10, 2017
380337b
changed README
anniehedgpeth May 10, 2017
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 examples/azure-cdn-with-storage-account/deploy.ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ docker run --rm -it \
--workdir=/data \
--entrypoint "/bin/sh" \
hashicorp/terraform:light \
-c "/bin/terraform destroy -force -var resource_group=$KEY;"
-c "/bin/terraform destroy -force -var resource_group=$KEY;"
28 changes: 28 additions & 0 deletions examples/azure-search-create/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Azure Search service

This Terraform template was based on [this](https://github.com/Azure/azure-quickstart-templates/tree/bf842409eeeeb7c4523add3922b204793eb4d85f/101-azure-search-create) Azure Quickstart Template. Changes to the ARM template that may have occurred since the creation of this example may not be reflected in this Terraform template.

This template creates a new Azure Search Service.

If you are unclear as to what parameters are allowed you can check the [Azure Search Management REST API docs on MSDN](https://msdn.microsoft.com/en-us/library/azure/dn832687.aspx).

## main.tf
The `main.tf` file contains the actual resources that will be deployed. It also contains the Azure Resource Group definition and any defined variables.

## outputs.tf
This data is outputted when `terraform apply` is called, and can be queried using the `terraform output` command.

## provider.tf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file doesn't exist, so I believe this section can be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @tombuildsstuff I changed the README; let me know what you think.

You may leave the provider block in the `main.tf`, as it is in this template, or you can create a file called `provider.tf` and add it to your `.gitignore` file.

Azure requires that an application is added to Azure Active Directory to generate the `client_id`, `client_secret`, and `tenant_id` needed by Terraform (`subscription_id` can be recovered from your Azure account details). Please go [here](https://www.terraform.io/docs/providers/azurerm/) for full instructions on how to create this to populate your `provider.tf` file.

## terraform.tfvars
If a `terraform.tfvars` file is present in the current directory, Terraform automatically loads it to populate variables. We don't recommend saving usernames and password to version control, but you can create a local secret variables file and use `-var-file` to load it.

If you are committing this template to source control, please insure that you add this file to your `.gitignore` file.

## variables.tf
The `variables.tf` file contains all of the input parameters that the user can specify when deploying this Terraform template.

![graph](/examples/azure-search-create/graph.png)
36 changes: 36 additions & 0 deletions examples/azure-search-create/deploy.ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/bash

set -o errexit -o nounset

docker run --rm -it \
-e ARM_CLIENT_ID \
-e ARM_CLIENT_SECRET \
-e ARM_SUBSCRIPTION_ID \
-e ARM_TENANT_ID \
-v $(pwd):/data \
--workdir=/data \
--entrypoint "/bin/sh" \
hashicorp/terraform:light \
-c "/bin/terraform get; \
/bin/terraform validate; \
/bin/terraform plan -out=out.tfplan -var search_name=$KEY -var resource_group=$KEY; \
/bin/terraform apply out.tfplan; \
/bin/terraform show;"

# cleanup deployed azure resources via azure-cli
docker run --rm -it \
azuresdk/azure-cli-python \
sh -c "az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID > /dev/null; \
az resource list --name $KEY"

# cleanup deployed azure resources via terraform
docker run --rm -it \
-e ARM_CLIENT_ID \
-e ARM_CLIENT_SECRET \
-e ARM_SUBSCRIPTION_ID \
-e ARM_TENANT_ID \
-v $(pwd):/data \
--workdir=/data \
--entrypoint "/bin/sh" \
hashicorp/terraform:light \
-c "/bin/terraform destroy -force -var search_name=$KEY -var resource_group=$KEY;"
15 changes: 15 additions & 0 deletions examples/azure-search-create/deploy.mac.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -o errexit -o nounset

if docker -v; then

# generate a unique string for CI deployment
export KEY=$(cat /dev/urandom | env LC_CTYPE=C tr -cd 'a-z' | head -c 12)
export PASSWORD=$KEY$(cat /dev/urandom | env LC_CTYPE=C tr -cd 'A-Z' | head -c 2)$(cat /dev/urandom | env LC_CTYPE=C tr -cd '0-9' | head -c 2)

/bin/sh ./deploy.ci.sh

else
echo "Docker is used to run terraform commands, please install before run: https://docs.docker.com/docker-for-mac/install/"
fi
Binary file added examples/azure-search-create/graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions examples/azure-search-create/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# provider "azurerm" {
# subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID"
# client_id = "REPLACE-WITH-YOUR-CLIENT-ID"
# client_secret = "REPLACE-WITH-YOUR-CLIENT-SECRET"
# tenant_id = "REPLACE-WITH-YOUR-TENANT-ID"
# }

resource "azurerm_resource_group" "rg" {
name = "${var.resource_group}"
location = "${var.location}"
}

resource "azurerm_search_service" "search" {
name = "${var.search_name}"
resource_group_name = "${azurerm_resource_group.rg.name}"
location = "${var.location}"
sku = "${var.sku}"
replica_count = "${var.replica_count}"
partition_count = "${var.partition_count}"
}
3 changes: 3 additions & 0 deletions examples/azure-search-create/outputs.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
output "Azure Search Service" {
value = "${azurerm_search_service.search.name}"
}
32 changes: 32 additions & 0 deletions examples/azure-search-create/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
variable "resource_group" {
description = "The name of the resource group in which to create search service"
}

variable "location" {
description = "The location/region where the search service is created. Changing this forces a new resource to be created."
default = "southcentralus"
}

variable "search_name" {
description = "Service name must only contain lowercase letters, digits or dashes, cannot use dash as the first two or last one characters, cannot contain consecutive dashes, and is limited between 2 and 60 characters in length."
}

variable "sku" {
description = "Valid values are 'free', 'standard', 'standard2', and 'standard3' (2 & 3 must be enabled on the backend by Microsoft support). 'free' provisions the service in shared clusters. 'standard' provisions the service in dedicated clusters."
default = "standard"
}

variable "replica_count" {
description = "Replicas distribute search workloads across the service. You need 2 or more to support high availability (applies to Basic and Standard only)."
default = 1
}

variable "partition_count" {
description = "Partitions allow for scaling of document count as well as faster indexing by sharding your index over multiple Azure Search units. Allowed values: 1, 2, 3, 4, 6, 12"
default = 1
}

variable "hosting_mode" {
description = "Applicable only for SKU set to standard3. You can set this property to enable a single, high density partition that allows up to 1000 indexes, which is much higher than the maximum indexes allowed for any other SKU. Allowed values: default, highDensity"
default = "default"
}