Commit Graph

716 Commits

Author SHA1 Message Date
Radek Simko deba1b63e9 docker/docs: Document new data source + limitations (#7814) 2016-07-26 17:07:35 +01:00
stack72 8f48a4106f
docs/aws: Add the App Autoscaling Resources to the nav bar in a section of their own 2016-07-26 10:50:17 +01:00
stack72 fcbaf3eea6
Merge branch 'feature/data-source-ecs' of https://github.com/nicolai86/terraform into nicolai86-feature/data-source-ecs 2016-07-22 13:43:18 +01:00
Paul Hinze fa7ef4ceed Update docs to centralize on ARM-based Azure provider (#7767)
Sidebar:

 - Rename "Azure (Resource Manager)" to "Microsoft Azure" and sort
   accordingly
 - Rename "Azure (Service Management)" to "Microsoft Azure (Legacy ASM)"
   and sort accordingly

ARM provider docs:

 - Name changes everywhere to Microsoft Azure Provider
 - Mention and link to "legacy Azure Service Management Provider" in opening paragraph
 - Sidebar gains link at bottom to Azure Service Management Provider

ASM provider docs:
 - Name changes everywhere to Azure Service Management Provider
 - Sidebar gains link at bottom to Microsoft Azure Provider
 - Every page gets a header with the following
 - "NOTE: The Azure Service Management provider is no longer being actively developed by HashiCorp employees. It continues to be supported by the community. We recommend using the Azure Resource Manager based [Microsoft Azure Provider] instead if possible."
2016-07-22 11:39:59 +01:00
stack72 fadfea45f4
Website: Change the link to AzureRM ScaleSets as the link was throwing a 404 2016-07-19 09:36:24 +01:00
Raphael Randschau 9081cabd6e Add scaleway provider (#7331)
* Add scaleway provider

this PR allows the entire scaleway stack to be managed with terraform

example usage looks like this:

```
provider "scaleway" {
  api_key = "snap"
  organization = "snip"
}

resource "scaleway_ip" "base" {
  server = "${scaleway_server.base.id}"
}

resource "scaleway_server" "base" {
  name = "test"
  # ubuntu 14.04
  image = "aecaed73-51a5-4439-a127-6d8229847145"
  type = "C2S"
}

resource "scaleway_volume" "test" {
  name = "test"
  size_in_gb = 20
  type = "l_ssd"
}

resource "scaleway_volume_attachment" "test" {
  server = "${scaleway_server.base.id}"
  volume = "${scaleway_volume.test.id}"
}

resource "scaleway_security_group" "base" {
  name = "public"
  description = "public gateway"
}

resource "scaleway_security_group_rule" "http-ingress" {
  security_group = "${scaleway_security_group.base.id}"

  action = "accept"
  direction = "inbound"
  ip_range = "0.0.0.0/0"
  protocol = "TCP"
  port = 80
}

resource "scaleway_security_group_rule" "http-egress" {
  security_group = "${scaleway_security_group.base.id}"

  action = "accept"
  direction = "outbound"
  ip_range = "0.0.0.0/0"
  protocol = "TCP"
  port = 80
}
```

Note that volume attachments require the server to be stopped, which can lead to
downtimes of you attach new volumes to already used servers

* Update IP read to handle 404 gracefully

* Read back resource on update

* Ensure IP detachment works as expected

Sadly this is not part of the official scaleway api just yet

* Adjust detachIP helper

based on feedback from @QuentinPerez in
https://github.com/scaleway/scaleway-cli/pull/378

* Cleanup documentation

* Rename api_key to access_key

following @stack72 suggestion and rename the provider api_key for more clarity

* Make tests less chatty by using custom logger
2016-07-13 21:03:41 +01:00
Joonas Bergius 0ce6337a2a docs: Add digitalocean_tag resource to the sidebar (#7629) 2016-07-13 20:48:00 +01:00
Antoine Grondin 3d6fe76b52 provider/digitalocean: adds a volume resource (#7560)
* provider/digitalocean: add support for volumes

* provider/digitalocean: add documentation for volume resource
2016-07-13 15:36:37 +01:00
Radek Simko 1ad0402b29 docs/aws: Fix wrong resource name in sidebar (#7606) 2016-07-12 16:23:35 +01:00
Derek Abdine 7bdc060d24 provider/logentries: Implementing logentries provider (#7067)
* logentries provider

* logentries vendoring

* logentries docs
2016-07-12 14:14:39 +01:00
Martin Häger 32abd937f1 SimpleDB domain resource (#7600) 2016-07-12 12:55:58 +01:00
Radek Simko 82d6d4a691 aws/docs: Fix Elastic Transcoder docs 2016-07-09 10:53:54 +01:00
Martin Atkins 861ac536dd provider/template: convert resources to data sources
The template resources don't actually need to retain any state, so they
are good candidates to be data sources.

This includes a few tweaks to the acceptance tests -- now configured to
run as unit tests -- since it seems that they have been slightly broken
for a while now. In particular, the "update" cases are no longer tested
because updating is not a meaningful operation for a data source.
2016-07-08 17:11:17 +01:00
Martin Atkins c244e5a668 Convert tls_cert_request to be a data source
This resource (unlike the others in this provider) isn't stateful, so it
is a good candidate to be a data source.

The old resource form is preserved via the standard shim in helper/schema,
which will generate a deprecation warning but will still allow the
resource to be used.
2016-07-02 08:07:53 -07:00
Clint 98fd603bdf provider/atlas: Add a Atlas Artifact Data Source (#7419)
* small doc update

* provider/atlas: Add docs for Artifact Data Source

* provider/atlas: Remove a test method that isn't used

* provider/atlas: Add Data Source for Atlas Artifact

* provider/atlas: Show deprecation error on atlas_artifact resource
2016-07-01 10:29:53 -05:00
Radek Simko 827fcf15c5 aws/docs: Make item ordering in sidebar alphabetical (#7358) 2016-06-27 12:36:32 +01:00
yissachar 1bd8b449e0 Add SES resource (#5387)
* Add SES resource

* Detect ReceiptRule deletion outside of Terraform

* Handle order of rule actions

* Add position field to docs

* Fix hashes, add log messages, and other small cleanup

* Fix rebase issue

* Fix formatting
2016-06-26 22:07:14 +01:00
Keshav Varma 58bd6dfb02 Add an AWS Spot fleet resource 2016-06-21 17:31:30 -07:00
Raphael Randschau 90889632e0 Add aws_ecs_container_definition data source
this datasource allows terraform to work with externally modified state, e.g.
when you're using an ECS service which is continously updated by your CI via the
AWS CLI.

right now you'd have to wrap terraform into a shell script which looks up the
current image digest, so running terraform won't change the updated service.

using the aws_ecs_container_definition data source you can now leverage
terraform, removing the wrapper entirely.
2016-06-19 21:50:37 +02:00
Brian Edwards d79879dba4 provider/datadog: add timeboard resource. upgrade vendored go-datadog-api to support read-only option. (#6900) 2016-06-15 18:44:49 +02:00
Paul Stack 514d8422f3 provider/azurerm: Add `azurerm_virtual_machine_scale_set` resource (#6711) 2016-06-11 00:37:14 +02:00
Paul Hinze 757aae538b Merge pull request #7012 from hpcloud/lbaas-v2
OpenStack LBaaS v2 Support
2016-06-10 16:07:10 -05:00
Paul Stack 32e1a32476 remote: Rename mas to azure (#7114)
MAS wasn't obvious it was Azure so renamed it to Azure
2016-06-10 20:04:40 +02:00
Maxime Bury c98f391bee Add basic implementation for remote state on azure (#7064)
* Add basic implementation for remote state on azure

* Don't auto-provision the container

* Fix compilation errors

* Add factory to the remote map

* Add documentation

* Add acceptance tests
2016-06-10 19:27:57 +02:00
dkalleg 8467f5219e OpenStack LBaaS v2 Support
CRUD, tests and Docs for managing a LoadBalancer, Listener,
Pool, Member, and Monitor resources.
2016-06-09 13:19:52 -07:00
James Bardin cd160d3f3f Merge pull request #6965 from hashicorp/jbardin/GH-3968
Add support for Amazon Elastic Transcoder
2016-06-07 17:28:55 -04:00
James Bardin 8eb4858c26 Add Elastic Transcoder docs 2016-06-07 16:29:14 -04:00
James Bardin b0bc6718a1 Merge pull request #7051 from hashicorp/jbardin/GH-3999
add sidebar link for elb_attachment
2016-06-07 13:33:21 -04:00
James Bardin e6481ccc74 add sidebar link for elb_attachment 2016-06-07 11:44:37 -04:00
Radek Simko 2a9f47aa70 provider/aws: aws_s3_object -> aws_s3_bucket_object (docs + filename) (#6979)
* aws/docs: Fix s3_bucket_object DS documentation

* provider/aws: aws_s3_object -> aws_s3_bucket_object
2016-06-02 12:13:39 +01:00
Radek Simko 1ea5cff9b3 Merge pull request #6946 from TimeIncOSS/f-aws-s3-object-data-source
provider/aws: Add aws_s3_bucket_object data source
2016-06-02 07:04:46 +01:00
Michael Handler a1e92c6f77 +github_repository_collaborator (#6861) 2016-06-02 01:06:35 +01:00
Radek Simko d4fe1b9145 provider/aws: Add s3_bucket_object data source 2016-06-01 19:14:17 +01:00
Matt Morrison cbfb4d8b86 remote state: Add GCS provider for remote state 2016-05-31 13:42:57 -05:00
James Nugent c91d62fda0 provider/aws: aws_iam_policy_document data source
This brings over the work done by @apparentlymart and @radeksimko in
PR #3124, and converts it into a data source for the AWS provider:

This commit adds a helper to construct IAM policy documents using
familiar Terraform concepts. It makes Terraform-style interpolations
easier and resolves the syntax conflict between Terraform interpolations
and IAM policy variables by changing the latter to use &{...} for its
interpolations.

Its use is completely optional and users are free to go on using literal
heredocs, file interpolations or whatever else; this just adds another
option that fits more naturally into a Terraform config.
2016-05-31 11:08:02 -05:00
James Nugent 5cb38c5041 Merge pull request #6911 from paybyphone/paybyphone_aws_ami_description_data_source
provider/aws: aws_ami_description - data source edition (now aws_ami)
2016-05-29 12:07:33 -07:00
James Nugent 5a0f6565d3 Merge pull request #6672 from apparentlymart/random-provider
Logical Resources for Random Values
2016-05-29 11:58:42 -07:00
Chris Marchesi 9ac7fb0276 provider/aws: New data source: aws_ami
This data source allows one to look up the most recent AMI for a specific
set of parameters, much like aws ec2 describe-images in the AWS CLI.

Basically a refresh of hashicorp/terraform#4396, in data source form.
2016-05-29 09:55:12 -07:00
Clint a8de40090a Update aws.erb
fix missing `>`
2016-05-25 11:48:40 -05:00
Clint 983b6710a5 provider/aws: Add per user, role and group policy attachment (supersedes #5816) (#6858)
* Add per user, role and group policy attachment

* Add docs for new IAM policy attachment resources.

* Make policy attachment resources manage only 1 entity<->policy attachment

* provider/aws: Tidy up IAM Group/User/Role attachments
2016-05-25 11:03:43 -05:00
James Nugent 1ea727eb13 provider/aws: Add aws_availability_zones source
This commit adds a data source with a single list, `instance` for the
schema which gets populated with the availability zones to which an
account has access.
2016-05-24 15:42:45 -05:00
Joe Topjian f674179109 Merge pull request #6693 from jtopjian/openstack-blockstorage-v2
provider/openstack: openstack_blockstorage_volume_v2 resource
2016-05-23 15:18:23 -06:00
Martin Atkins 158a90b25b Grafana Provider, with Data Source and Dashboard resources (#6206)
* Grafana provider

* grafana_data_source resource.

Allows data sources to be created in Grafana. Supports all data source
types that are accepted in the current version of Grafana, and will
support any future ones that fit into the existing structure.

* Vendoring of apparentlymart/go-grafana-api

This is in anticipation of adding a Grafana provider plugin.

* grafana_dashboard resource

* Website documentation for the Grafana provider.
2016-05-20 10:20:17 +01:00
Ricard Clau 283e3ae6b5 fix sidebar + small rewordings (#6782) 2016-05-19 23:25:47 +01:00
Mitchell Hashimoto 54df833406
website: add import command docs 2016-05-18 12:57:03 -06:00
Mitchell Hashimoto 6d9e41668f
website: basic docs on import 2016-05-18 12:57:03 -06:00
stack72 27f05b8e3b Merge branch 'wowgroup-aws-rds-cluster-param-group' 2016-05-18 14:11:47 +01:00
Joe Topjian b204d35e19 provider/openstack openstack_blockstorage_volume_v2 resource
This commit adds an openstack_blockstorage_volume_v2 resource. This
resource is able to create volumes using the OpenStack Block Storage
v2 API.
2016-05-17 13:20:26 +00:00
Martin Atkins feafc94dde website: docs for the "random" provider 2016-05-14 16:49:10 -07:00
Martin Atkins 64f2651204 website: Initial documentation about data sources
This will undoubtedly evolve as implementation continues, but this is some
initial documentation based on the design doc.
2016-05-14 08:26:36 -07:00
Martin Atkins 3eb4a89104 provider/terraform: remote state resource becomes a data source
As a first example of a real-world data source, the pre-existing
terraform_remote_state resource is adapted to be a data source. The
original resource is shimmed to wrap the data source for backward
compatibility.
2016-05-14 08:26:36 -07:00
Martin Atkins fecacb5e10 website: fix navbar typo on azurerm_sql_firewall_rule 2016-05-12 18:08:18 -07:00
stack72 fdf1962905 Merge branch 'aws-rds-cluster-param-group' of https://github.com/wowgroup/terraform into wowgroup-aws-rds-cluster-param-group 2016-05-12 23:27:20 +01:00
Mitchell Hashimoto 04598baa25
website: document state mv 2016-05-10 13:25:42 -07:00
Chris Bednarski 3c774af9c2 Warn when an internal plugin is overridden
Also added documentation explaining what happened and how to fix it
2016-05-10 14:49:13 -04:00
Mitchell Hashimoto 5737c0a13b website: update docs for state show 2016-05-10 14:14:48 -04:00
Mitchell Hashimoto d1b46e99bd Add `terraform state list` command
This introduces the terraform state list command to list the resources
within a state. This is the first of many state management commands to
come into 0.7.

This is the first command of many to come that is considered a
"plumbing" command within Terraform (see "plumbing vs porcelain":
http://git.661346.n2.nabble.com/what-are-plumbing-and-porcelain-td2190639.html).
As such, this PR also introduces a bunch of groundwork to support
plumbing commands.

The main changes:

- Main command output is changed to split "common" and "uncommon"
  commands.

- mitchellh/cli is updated to support nested subcommands, since
  terraform state list is a nested subcommand.

- terraform.StateFilter is introduced as a way in core to filter/search
  the state files. This is very basic currently but I expect to make it
  more advanced as time goes on.

- terraform state list command is introduced to list resources in a
  state. This can take a series of arguments to filter this down.

Known issues, or things that aren't done in this PR on purpose:

- Unit tests for terraform state list are on the way. Unit tests for the
  core changes are all there.
2016-05-10 14:14:47 -04:00
Paul Stack af29a61748 provider/aws: Change `aws_elastic_ip_association` to have computed parameters (#6552)
* New top level AWS resource aws_eip_association

* Add documentation for aws_eip_association

* Add tests for aws_eip_association

* provider/aws: Change `aws_elastic_ip_association` to have computed
parameters

The AWS API was send ing more parameters than we had set. Therefore,
Terraform was showing constant changes when plans were being formed
2016-05-09 18:40:45 +01:00
stack72 8dc123fd94 Scaffold the AWS DB Option Group resource
Change the AWS DB Instance to now include the DB Option Group param. Adds a test to prove that it works

Add acceptance tests for the AWS DB Option Group work. This ensures that Options can be added and updated

Documentation for the AWS DB Option resource
2016-05-08 20:18:53 +01:00
Kraig Amador 1f80ec48d0 Added RDS event subscriptions (#6367) 2016-05-05 11:14:25 +01:00
danielcbright 8921e10d71 Added softlayer virtual guest and ssh keys functionality:
Here is an example that will setup the following:
+ An SSH key resource.
+ A virtual server resource that uses an existing SSH key.
+ A virtual server resource using an existing SSH key and a Terraform managed SSH key (created as "test_key_1" in the example below).

(create this as sl.tf and run terraform commands from this directory):
```hcl
provider "softlayer" {
    username = ""
    api_key = ""
}

resource "softlayer_ssh_key" "test_key_1" {
    name = "test_key_1"
    public_key = "${file(\"~/.ssh/id_rsa_test_key_1.pub\")}"
    # Windows Example:
    # public_key = "${file(\"C:\ssh\keys\path\id_rsa_test_key_1.pub\")}"
}

resource "softlayer_virtual_guest" "my_server_1" {
    name = "my_server_1"
    domain = "example.com"
    ssh_keys = ["123456"]
    image = "DEBIAN_7_64"
    region = "ams01"
    public_network_speed = 10
    cpu = 1
    ram = 1024
}

resource "softlayer_virtual_guest" "my_server_2" {
    name = "my_server_2"
    domain = "example.com"
    ssh_keys = ["123456", "${softlayer_ssh_key.test_key_1.id}"]
    image = "CENTOS_6_64"
    region = "ams01"
    public_network_speed = 10
    cpu = 1
    ram = 1024
}
```

You'll need to provide your SoftLayer username and API key,
so that Terraform can connect. If you don't want to put
credentials in your configuration file, you can leave them
out:

```
provider "softlayer" {}
```

...and instead set these environment variables:

- **SOFTLAYER_USERNAME**: Your SoftLayer username
- **SOFTLAYER_API_KEY**: Your API key
2016-05-03 15:58:58 -05:00
Joe Topjian 8f2b6e8127 Merge pull request #6410 from cristicalin/neutron_security_groups_v1
provider/openstack: implement neutron security groups and rules
2016-05-03 08:18:41 -06:00
Cristian Calin 6fe82696d2 provider/openstack: Neutron security group resources
this implements two new resource types:
* openstack_networking_secgroup_v2 - create a neutron security group
* openstack_networking_secgroup_rule_v2 - create a newutron security
  group rule
Unlike their nova counterparts the neutron security groups allow a user
to specify the target tenant_id allowing a cloud admin to create per
tenant resources.
2016-05-03 09:18:48 +00:00
Seth Vargo 74949f9554
Track enhanced links 2016-05-02 15:56:12 -04:00
Henrik Hodne 8f07a2d6d5 provider/librato: Add Librato provider 2016-04-29 14:49:55 -05:00
Radek Simko e3ade6a784 provider/aws: Add support for api_gateway_account (#6321) 2016-04-27 13:08:59 +01:00
Radek Simko d31a6ac47f provider/aws: Add support for api_gateway_authorizer (#6320) 2016-04-25 12:22:37 +01:00
Roberto Jung Drebes a62501334f provider/openstack: update doc sidebar link to openstack_networking_router_route_v2 2016-04-23 11:42:01 +02:00
Martin Atkins 51a71c0a49 website: Add consul_key_prefix link to Consul provider navbar
This file was missed when committing the doc changes for #5988.
2016-04-22 14:07:35 -07:00
Mitchell Hashimoto 30d501b3f0
website: name vpc_peering_connection in docs properly 2016-04-20 12:13:30 -07:00
Josh Myers 3be66aa9ed Add cloudwatch_logs_subscription_filter provider (#5996) 2016-04-20 20:05:21 +01:00
Cameron Stokes 4a6cd9054f Fix spacing in Triton resources sidebar. (#6240) 2016-04-19 17:53:51 +01:00
Clint fcdcb4b916 provider/aws: Default Network ACL resource (#6165)
* provider/aws: Default Network ACL resource

Provides a resource to manage the default AWS Network ACL. VPC Only.

* Remove subnet_id update, mark as computed value. Remove extra tag update

* refactor default rule number to be a constant

* refactor revokeRulesForType to be revokeAllNetworkACLEntries

Refactor method to delete all network ACL entries, regardless of type. The
previous implementation was under the assumption that we may only eliminate some
rule types and possibly not others, so the split was necessary.

We're now removing them all, so the logic isn't necessary

Several doc and test cleanups are here as well

* smite subnet_id, improve docs
2016-04-18 11:02:00 -05:00
Martin Atkins 94f338d5de Merge #4276: aws_opsworks_instance resource 2016-04-16 10:14:22 -07:00
Martin Atkins bb7b8d6550 Merge #4419: aws_opsworks_application resource 2016-04-16 09:28:12 -07:00
Joe Topjian 831bae8624 provider/cobbler: Cobbler Provider
This introduces a provider for Cobbler. Cobbler manages bare-metal
deployments and, to some extent, virtual machines. This initial
commit supports the following resources: distros, profiles, systems,
kickstart files, and snippets.
2016-04-16 08:54:59 -05:00
Chris Marchesi a38ccbe074 CloudFront distribution and origin access identity support (#5221)
* CloudFront implementation v3

* Update tests

* Refactor - new resource: aws_cloudfront_distribution

 * Includes a complete re-write of the old aws_cloudfront_web_distribution
   resource to bring it to feature parity with API and CloudFormation.
 * Also includes the aws_cloudfront_origin_access_identity resource to generate
   origin access identities for use with S3.
2016-04-14 14:55:11 -05:00
captainill c5dbf1d04a annoucnement bnr 2016-04-11 13:02:15 -05:00
protomouse b45e941144 add resource aws_rds_cluster_parameter_group 2016-04-11 10:26:47 +02:00
Jan Nabbefeld 6bf9f21c39 Opsworks Application support 2016-04-07 14:18:50 -07:00
Seth Vargo 4fde3b2be9 Capitalize the H in GitHub
GitHub really doesn't like when you make the H lowercase, it violates
their brand guidelines and they won't help promote anything that doesn't
use the capital H.
2016-04-07 10:26:01 -04:00
Sander van Harmelen 5e6af8e01b Merge pull request #6010 from svanharmelen/f-deprecate-ipaddress
provider/cloudstack: make the CloudStack provider more inline with the other providers
2016-04-05 21:54:23 +02:00
KOJIMA Kazunori d646682d7a provider/aws: Support S3 bucket notification
* Implement aws_s3_bucket_notification resource
2016-04-04 21:23:06 -05:00
Sander van Harmelen fddf3eccc6 Make the CloudStack provider more inline with the other provider
It turns out all other providers use `ip_address` where the CloudStack
provider uses `ipaddress`. To make this more consistent this PR
deprecates `ipaddress` and adds `ip_address` where needed…
2016-04-04 22:16:15 +02:00
Martin Atkins fa703db8a6 Merge #4955: "terraform fmt" command 2016-04-04 01:07:32 -07:00
Clint c9293cc832 Merge pull request #5814 from hashicorp/provider-fastly-v1
provider/fastly: V1 of the Fastly Provider
2016-03-24 10:57:32 -05:00
clint shryock 2ad37bba4a provider/fastly: Add Fastly Provider, ServiceV1 resource 2016-03-23 14:53:50 -05:00
Seth Vargo 85d54e62d3 Do not build supporting JS files
These files are already included in the bundle
2016-03-22 23:33:40 +02:00
Jack Pearkes 433e7aba3a website: rename application.js
CDN fix
2016-03-22 11:42:03 -07:00
stack72 da589da24c documentation: Reshuffle the AzureRM provider documentation headings 2016-03-22 14:17:36 +00:00
James Nugent 22a409e4cc Merge pull request #5774 from stack72/f-aws-iam-user-sshkey
provider/aws: Add `aws_iam_user_ssh_key` resource
2016-03-22 10:29:08 +00:00
stack72 49c5137ef5 provider/aws: Add documentation for `aws_iam_user_ssh_key` resource 2016-03-22 01:19:39 +00:00
Paul Hinze b2d3f92f7b Merge pull request #4893 from ack/clc
provider/clc: CenturyLink Cloud Provider
2016-03-21 18:33:00 -05:00
stack72 fe79dcf6c1 provider/azurerm: Add the documentation for the AzureRM Template
Deployment resource
2016-03-21 18:59:54 +00:00
Paul Hinze 74de2fa378 Merge pull request #5760 from uber/b-website-gcp-instance-group
Correct markdown for google_compute_instance_group and attach to index
2016-03-21 12:36:26 -05:00
Bill Fumerola 972aecdd84 Correct markdown for google_compute_instance_group and attach to index 2016-03-21 10:29:59 -07:00
James Nugent f946695187 Merge pull request #5444 from TimeIncOSS/f-aws-logs-metric-filter
provider/aws: Add support for CloudWatch Log Metric Filter
2016-03-21 16:43:38 +00:00
Albert Choi 7775cc8ccc snapshot from CenturyLinkLabs/terraform-provider-clc
+examples +docs for clc
2016-03-21 08:58:37 -07:00
James Nugent e70764f64d provider/triton: New provider for Joyent Triton
This brings across the following resources for Triton from the
joyent/triton-terraform repository, and converts them to the canonical
Terraform style, introducing Terraform-style documentation and
acceptance tests which run against the live API rather than the local
APIs:

- triton_firewall_rule
- triton_machine
- triton_key
2016-03-20 20:15:17 +00:00
Martin Atkins 7061448d74 Docs for InfluxDB provider and database resource 2016-03-20 14:53:34 -05:00
Josh Masseo 1b4991163f UltraDNS Provider 2016-03-20 12:10:59 -05:00
James Nugent 85b4b5813f Revert "provider/triton: New provider for Joyent Triton"
This reverts commit f60f04ac70.
2016-03-19 17:53:06 +00:00
James Nugent f60f04ac70 provider/triton: New provider for Joyent Triton
This brings across the following resources for Triton from the
joyent/triton-terraform repository, and converts them to the canonical
Terraform style, introducing Terraform-style documentation and
acceptance tests which run against the live API rather than the local
APIs:

- triton_firewall_rule
- triton_machine
- triton_key
2016-03-18 23:35:01 +00:00
Paul Hinze 07caec0d14 Merge pull request #5194 from objectpartners/f-github-provider
GitHub Organization Provider
2016-03-17 10:53:13 -05:00
stack72 808ce45612 provider/azurerm: Adds documentation for the `azurerm_virtual_machine`
resource
2016-03-17 15:08:59 +00:00
Radek Simko 7a33fad25f provider/aws: Add docs for CloudWatch Log Metric Filter 2016-03-15 15:01:20 +00:00
Jeff Tang bcd5904eea Add support for Opsworks Instances
New resource checklist
- [x] Acceptance testing
- [x] Documentation
- [x] Well-formed code
2016-03-14 15:12:43 -04:00
Paul Hinze 57070057db Merge pull request #5527 from hashicorp/phinze/untaint
command: Add `terraform untaint`
2016-03-14 09:34:43 -05:00
Paul Hinze c7f5450a96 command: Add `terraform untaint`
- [x] Docs
 - [x] Command Unit Tests
 - [x] State Unit Tests

Closes #4820
2016-03-11 12:38:57 -06:00
Paul Hinze d12944797a Merge pull request #3928 from TimeIncOSS/aws-kms
provider/aws: Add support for KMS
2016-03-09 18:30:06 -06:00
Ricard Clau 8e486985d3 vsphere_folder resource missing in vsphere provider layout 2016-03-09 23:16:12 +00:00
Jacob Severson c1b373ad5f Add Github Organization provider.
Allows for managing organization membership, teams, team membership, and
team repositories.
2016-03-08 23:06:30 +01:00
Radek Simko c030745e45 docs: Make a separate Elastic Beanstalk section in sidebar 2016-03-08 09:53:06 +00:00
Philip Witty fd4be284da Added docs for kms 2016-03-08 09:30:47 +00:00
clint shryock f0d3176999 provider/aws: Add Elastic Beanstalk Application, Configuration Template, and Environment
This adds support for Elastic Beanstalk Applications, Configuration Templates,
and Environments.

This is a combined work of @catsby, @dharrisio, @Bowbaq, and @jen20
2016-03-07 14:43:23 -06:00
Dan Carley cc41c7cfa0 command/fmt: Add new fmt command
This uses the `fmtcmd` package which has recently been merged into HCL. Per
the usage text, this rewrites Terraform config files to their canonical
formatting and style.

Some notes about the implementation for this initial commit:

- all of the fmtcmd options are exposed as CLI flags
- it operates on all files that have a `.tf` suffix
- it currently only operates on the working directory and doesn't accept a
  directory argument, but I'll extend this in subsequent commits
- output is proxied through `cli.UiWriter` so that we write in the same way
  as other commands and we can capture the output during tests
- the test uses a very simple fixture just to ensure that it is working
  correctly end-to-end; the fmtcmd package has more exhaustive tests
- we have to write the fixture to a file in a temporary directory because it
  will be modified and for this reason it was easier to define the fixture
  contents as a raw string
2016-03-07 15:07:04 +00:00
Kazunori Kojima fbc94cb330 website: Fix missing sidebar_current 2016-03-06 23:51:25 +09:00
Radek Simko 61d0d19ae3 Fix typo (APIGateway -> API Gateway) 2016-03-06 09:29:31 +00:00
Radek Simko c6c2752211 provider/aws: Sort API Gateway resources alphabetically 2016-03-06 09:29:31 +00:00
Raphael Randschau 6430fca7f6 Add aws_api_gateway_deployment resource 2016-03-05 23:21:58 +01:00
Raphael Randschau 8c59d0861e Add aws_api_gateway_api_key resource 2016-03-05 23:21:54 +01:00
Raphael Randschau b4c99f1009 Add aws_api_gateway_model resource 2016-03-05 23:21:51 +01:00
Raphael Randschau 4da8b3d03a Add aws_api_gateawy_integration_response resource 2016-03-05 23:21:48 +01:00
Raphael Randschau 1593dbe9c8 Add aws_api_gateway_integration resource 2016-03-05 23:21:44 +01:00
Raphael Randschau 91f5206f8d Add aws_api_gateway_method_response resource 2016-03-05 23:21:41 +01:00
Raphael Randschau 032e6081cb Add aws_api_gateway_method resource 2016-03-05 23:21:38 +01:00
Raphael Randschau 7ead800f6a Add aws_api_gateway_resource resource 2016-03-05 23:21:35 +01:00
Raphael Randschau a73721d248 Add aws_api_gateway_rest_api resource 2016-03-05 23:13:38 +01:00
Radek Simko 1686a1023c provider/aws: Add docs for AWS Account Password Policy resource 2016-02-26 13:29:34 +00:00
Matt Morrison 2d78cf0d37 add missing sidebar link to new google_compute_subnetwork resource 2016-02-25 16:56:01 +13:00
Otto Jongerius c8bd02abee Add Datadog doco. 2016-02-22 15:04:29 -05:00
stack72 3eab9f2ff0 provider/azurerm: Add documentation for the `azurerm_search_service`
resource
2016-02-19 00:57:51 +00:00
Justin Campbell b78f1b6670 website: Sort aws_key_pair in the sidebar 2016-02-18 09:22:14 -05:00
Radek Simko f53ea0b4a4 provider/aws: Add docs for aws_lambda_permission 2016-02-15 17:16:41 +00:00
Radek Simko e288b161d7 provider/aws: Document CloudWatch Events 2016-02-13 13:21:33 +00:00
stack72 584b52c34c provider/azurerm: Add `azurerm_sql_firewall_rule` resource 2016-02-08 21:13:59 +00:00
Soren Mathiasen db69a2959b Added verify command 2016-02-08 12:48:14 +01:00
stack72 81b50330a1 provider/azurerm: Add `azurerm_dns_mx_record` resource 2016-02-07 22:26:56 +00:00
stack72 8ac4d2e080 provider/azurerm: Add `azurerm_dns_srv_record` resource 2016-02-07 21:49:02 +00:00
stack72 f9ffeae0f6 provider/azurerm: Add `azurerm_dns_ns_record` resource 2016-02-06 19:09:52 +00:00
stack72 37bc5a4c80 provider/azurerm: Add `azurerm_dns_txt_record` resource 2016-02-06 18:43:53 +00:00
stack72 6b5e5710c8 provider/azurerm: Add DNS CName Record Resource 2016-02-05 12:51:33 +00:00
stack72 1357f150a5 provider/azurerm: Add AzureRM AAAA DNS Record resource 2016-02-05 12:14:09 +00:00
stack72 761308cd2a provider/azurerm: Add the DNS A Record Resource 2016-02-05 11:28:48 +00:00
stack72 d89088246c provider/azurerm: Adding azurerm_sql_database resource 2016-02-04 23:36:50 +00:00
stack72 4ef557bed7 deps: Update jen20/riviera 2016-02-04 10:02:58 +00:00
Paul Stack 1421d4ce18 provider/azurerm: Add `azurerm_dns_zone` resource
This resource is the first which makes use of the new Riviera library
(at https://github.com/jen20/riviera), so there is some additional set
up work to add the provider to the client which gets passed among
resources.
2016-02-02 19:53:00 -05:00
Joe Topjian baeaee0103 Merge pull request #4359 from jtopjian/jtopjian-openstack-lb-member
provider/openstack: Load Balancing Member Resource
2016-01-31 15:40:15 -07:00
Benjamin Jorand aea329ae92 [docs] aws_key_pair resource documentation should be listed in "ec2" and not in "vpc" 2016-01-29 17:43:14 +01:00
Dmytro Aleksandrov 3cfe3374a3 provider/powerdns: Add site documentation 2016-01-28 10:10:46 -05:00
James Nugent 7177a87312 Merge pull request #4842 from hashicorp/f-azurerm-storage-resources
provider/azurerm: Add storage container and blob
2016-01-27 11:23:11 -05:00
Silas Sewell 0b9a80ebef docs: add locally_signed_cert to tls sidenav 2016-01-27 08:13:59 -05:00
stack72 5a5c32e7d2 Azure RM Storage Queue:
Adds the schema, CRUD, acceptance tests and documentation for the
AzureRM storage Queue resource
2016-01-27 12:27:58 +00:00
stack72 e470ffd0be AzureRM storage container and blob tests and documentation 2016-01-27 00:23:57 +00:00
Radek Simko fc0795019e docs: Add missing link to aws_lambda_alias 2016-01-25 12:47:07 +00:00
Seth Vargo eeb80e06b7 Add structured data 2016-01-24 13:32:35 -05:00
James Nugent 8449cf9d98 provider/azurerm: `azurerm_storage_account` docs 2016-01-20 19:58:48 -05:00
stack72 d91c7080e0 Scaffold the AzureRM CDN Endpoint resource 2016-01-20 16:47:41 +00:00
stack72 183eb248df Scaffold the Azure RM CDN Profile 2016-01-19 17:37:28 +00:00
Radek Simko f2ffff33eb docs: Create new section for remote state backends 2016-01-18 08:08:19 +00:00
James Nugent c9ebbb9eb2 provider/docker: Add missing sidebar doc link 2016-01-15 21:36:17 +00:00
Seth Vargo 8dbc43639d Use HTTPS + www. for links 2016-01-14 16:03:26 -05:00
James Nugent ee7553f076 Merge branch 'docker_network' of https://github.com/ColinHebert/terraform into ColinHebert-docker_network 2016-01-14 07:01:03 +00:00
James Nugent ea9e01cc78 Merge pull request #4669 from lwander/f-gcp-sql-user
provider/google: SQL user resource, documentation & tests
2016-01-14 06:51:17 +00:00
Clint 7f6624e926 Merge pull request #3862 from stack72/aws-redshift
provider/aws: AWS Redshift
2016-01-13 16:52:47 -06:00
Lars Wander 456ec4d151 provider/google: SQL user resource, documentation & tests 2016-01-13 16:33:08 -05:00
stack72 b1c8c30df3 Scaffold the Azure RM Route Resource 2016-01-10 15:02:48 +00:00
stack72 c1fa8392e3 Scaffold Azure RM Route Table resource 2016-01-10 02:47:20 +00:00
stack72 53714542f8 Scaffold the Azure RM Network Interface resource 2016-01-10 01:23:46 +00:00
stack72 36e0978653 Organises the AzureRM layout to Network and Virtual Machine resources 2016-01-10 01:09:14 +00:00
stack72 55ba179046 Scaffold the Azure RM Subnet resource 2016-01-09 18:09:46 +00:00
stack72 719f3ad2ce Scaffold the Azure RM Network Security Rule resource 2016-01-09 00:06:58 +00:00
David Radcliffe 37a250fc7a fix typo in chef docs sidebar 2016-01-08 15:28:51 -05:00
Paul Hinze b6907f9bd4 docs: cloudinit_config - correct syntax and add sidebar link 2016-01-08 13:34:16 -06:00
stack72 eab75dc884 Scaffolds the AzureRM Public IP resource 2016-01-08 00:25:50 +00:00
stack72 f79d951524 Rename the AzureRM Security Group to AzureRM Network Security Group 2016-01-07 22:38:11 +00:00
stack72 43760d4670 Scaffolding for the AzureRM Network Security Groups 2016-01-07 21:05:50 +00:00
stack72 fac989ed5f Azure RM Availability Sets. Adds Schema, CRUD, Acceptance Tests and Documentation 2016-01-07 14:18:18 +00:00
Colin Hebert f09280891c Add support of custom networks in docker 2016-01-02 12:20:55 +01:00
James Nugent 9da5dec5e7 Merge pull request #4342 from aznashwan/f-azure-localnets
provider/azure: added local network gateway resource
2015-12-31 09:52:05 -05:00
John Engelman b6788479de Add Terraform/Remote State documentation to provider/resource section.
Issue #2074
2015-12-27 19:04:27 +01:00
Nashwan Azhari 1eb129a99b provider/azure: added local network gateway resource 2015-12-23 18:49:21 +02:00
Radek Simko ae7dcfcf1b docs/aws: Fix highlighting of ECR in sidebar 2015-12-23 16:21:22 +01:00
Radek Simko 00da717302 docs/aws: Whitespaces removed 2015-12-23 16:19:28 +01:00
Paul Hinze 0d895ffa96 provider/aws: mention us-east-1 in ECR docs and tests
ECR is only available in us-east-1 for now.

Also added missing sidebar links for ECR resources.

/cc @nextrevision
2015-12-22 16:00:21 -06:00
stack72 bf03752552 Adding the documentation for the AWS Redshift Subnet Group resource
also removed the notion of tags from the redshift security group and
parameter group documentation until that has been implemented

Redshift Cluster CRUD and acceptance tests

Removing the Acceptance test for the Cluster Updates. You cannot delete
a cluster immediately after performing an operation on it. We would need
to add a lot of retry logic to the system to get this test to work

Adding some schema validation for RedShift cluster

Adding the last of the pieces of a first draft of the Redshift work - this is the documentation
2015-12-20 20:20:05 +00:00
stack72 48091e37c7 Adding the documentation for the Redshift Parameter Groups
Changed the aws_redshift_security_group and aws_redshift_parameter_group
to remove the tags from the schema. Tags are a little bit more
complicated than originally though - I will revisit this later

Then added the schema, CRUD functionality and basic acceptance tests for
aws_redshift_subnet_group

Adding an acceptance test for the Update of subnet_ids in AWS Redshift Subnet Group
2015-12-20 20:20:03 +00:00
stack72 249e7df76c Adding the documentation for the Redshift security groups
Creation of the schema, CRUD and acceptance tests for Redshift Parameter Group
2015-12-20 20:20:01 +00:00
captainill ec0582d5b4 capital C in by hashicorp lockup 2015-12-19 21:33:48 -08:00
stack72 d932d99679 Adds documentation for the AWS Network ACL Rule resource 2015-12-18 23:17:08 +00:00
James Nugent 0bdf249f2c provider/aws: Add aws_nat_gateway Resource 2015-12-18 14:12:27 -05:00
Joe Topjian 8d5a2d05a4 provider/openstack: Load Balancing Member Resource
This commit adds the openstack_lb_member_v1 resource. This resource models a
load balancing member which was previously coupled to the openstack_lb_pool_v1
resource.

By creating an actual member resource, load balancing members can now be
dynamically managed through terraform.
2015-12-17 07:29:58 +00:00
Martin Atkins a9d97708ee mysql provider and mysql_database resource.
Allows databases on pre-existing MySQL servers to be created and managed
by Terraform.
2015-12-16 17:59:35 -08:00
James Nugent 805c4896bd provider/azurerm: Clean up work for base provider
- Add documentation for resources
- Rename files to match standard patterns
- Add acceptance tests for resource groups
- Add acceptance tests for vnets
- Remove ARM_CREDENTIALS file - as discussed this does not appear to be
  an Azure standard, and there is scope for confusion with the
  azureProfile.json file which the CLI generates. If a standard emerges
  we can reconsider this.
- Validate credentials in the schema
- Remove storage testing artefacts
- Use ARM IDs as Terraform IDs
- Use autorest hooks for logging
2015-12-15 18:31:02 -05:00
Martin Atkins 764ea7f39c Documentation for the Chef provider. 2015-12-13 15:09:17 -08:00
stack72 c965d2278e Adding a resource for aws_autoscaling_schedule 2015-12-11 18:43:38 +00:00
clint shryock 5b036fbf4f provider/dyn: Add Dyn to the documentation sidebar 2015-12-09 14:05:18 -06:00
Corey Farwell b7acbd7887 Fix typo 'storaege' → 'storage' 2015-12-05 14:20:24 -05:00
Adrian Chelaru e1eef15646 postgresql provider with "database" and "role" resources 2015-12-03 23:44:20 -08:00
Paul Hinze 9e68c34abe Merge pull request #3785 from hmrc/master
VMWare vCloud Director Support
2015-12-03 15:51:47 -06:00
pat 6f7ef2fadd golang pubsub SDK has been released. moved topics/subscriptions to use that
Conflicts:
	builtin/providers/google/provider.go
	builtin/providers/google/resource_subscription.go
	builtin/providers/google/resource_subscription_test.go

golang pubsub SDK has been released.  moved topics/subscriptions to use that

Conflicts:
	builtin/providers/google/provider.go
	builtin/providers/google/resource_subscription.go
	builtin/providers/google/resource_subscription_test.go

file renames and add documentation files

remove typo'd merge and type file move

add to index page as well

only need to define that once

remove topic_computed schema value

I think this was used at one point but is no longer. away.

cleanup typo

adds a couple more config values

- ackDeadlineSeconds: number of seconds to wait for an ack
- pushAttributes: attributes of a push subscription
- pushEndpoint: target for a push subscription

rearrange to better match current conventions

respond to all of the comments
2015-12-02 10:36:00 -08:00
James Nugent 3cbe014e31 Add missing documentation link for #4093 2015-12-01 08:47:12 -05:00
James Nugent 72b8c82c08 Merge pull request #4106 from stack72/statuscake-documentation
provider/statuscake: Adding some documentation
2015-11-30 12:49:31 +00:00
stack72 3ecf722b77 Adding some documentation for the StatusCake provider 2015-11-30 10:44:21 +00:00
stack72 d0548a8165 Changing aws_route from Route53 layout to VPC layout 2015-11-29 14:49:45 +00:00
James Nugent 1cde2e64a0 Merge pull request #3748 from stack72/do-floatingips
provider/digitalocean : New Resource for Floating IPs
2015-11-24 13:16:24 +02:00
Seth Vargo a61c375115 Capital 'C' /cc @mitchellh 2015-11-23 21:31:28 -05:00
stack72 7bda855590 Adding the work to assign a Floating IP to a Droplet 2015-11-20 19:12:31 +02:00
Brett Mack cc54785b1c Merge branch 'terraform' into hmrc 2015-11-17 10:13:53 +00:00
Clint 0346c66d1c Merge pull request #3839 from hashicorp/new_header
New header/footer redesign
2015-11-16 16:05:37 -06:00
Paul Hinze afb416fba4 Merge pull request #2807 from dwradcliffe/f-dyn-provider
add Dyn provider
2015-11-16 13:53:44 -06:00
Lars Wander 28819603ba provider/google: HTTPS health checks resource + tests & documentation 2015-11-12 10:48:26 -05:00
Nicki Watt 5df9d22a6a Minor doc updates 2015-11-11 07:43:36 +00:00
stack72 8c68cb1080 Adding the documentation for the Kinesis Firehose Delivery Stream 2015-11-10 16:43:34 +00:00
captainill 54c722f2e8 final cleanup 2015-11-09 22:25:03 -08:00
captainill ebec7e2bc2 use more atomic styles for header/footer classes. use page url to determin class names 2015-11-09 22:11:00 -08:00
captainill 2d30d8f483 fix incorrect link 2015-11-06 15:45:02 -08:00
captainill a5f8ecfdd8 header styles complete + subpage 2015-11-06 15:41:23 -08:00
captainill 39cbc56161 in progress header redesign 2015-11-06 12:35:24 -08:00
Brett Mack bda4ef7e7c Merge branch 'terraform' into hmrc 2015-11-06 10:22:25 +00:00
Paul Hinze d347b9d8e5 Merge pull request #3729 from hashicorp/docs-vmware-vsphere
docs: Change vSphere to VMware vSphere
2015-11-05 13:07:50 -06:00
Brett Mack cb90e6c037 Merge branch 'master' into hmrc 2015-11-05 16:35:27 +00:00
Dave Cunningham bb5eb4ff46 Merge pull request #3702 from lwander/f-gcp-global-forwarding-rule
provider/google: global forwarding rule tests & documentation
2015-11-03 13:41:08 -05:00
Lars Wander d344d3e39a provider/google: global forwarding rule tests & documentation 2015-11-03 13:31:46 -05:00
Lars Wander d11524682a provider/google: Target HTTPS proxy resource + tests & documentation 2015-11-03 12:34:13 -05:00
Dave Cunningham 0097d7105b Merge pull request #3727 from lwander/f-gcp-target-http-proxy
provider/google: Target HTTP proxy resource + tests & documentation
2015-11-03 12:12:01 -05:00
Lars Wander e7ebb0ac40 provider/google: target http proxies resource + tests & documentation 2015-11-03 08:54:30 -05:00
Joe Topjian 312d371ce9 provider/openstack: Additions to the OpenStack Port resource
This commit adds further work to the OpenStack port resource:

* Makes relevant fields computed
* Adds state change functions
* Adds acceptance tests
* Adds Documentation
2015-11-03 06:07:32 +00:00
Cameron Stokes d99b9aaa6f vSphere occurrence in layout 2015-11-02 18:25:05 -08:00
Cameron Stokes 964c9cd7e8 Change all occurrences of 'vSphere' to 'VMware vSphere' 2015-11-02 18:21:08 -08:00
Lars Wander ccb3f92bd1 provider/google: Added url map resource + tests & documentation 2015-11-02 17:12:41 -05:00
Dave Cunningham 232a538c14 Merge pull request #3723 from lwander/f-gcp-ssl-certs
provider/google: SSL Certificates resource + tests & documentation
2015-11-02 14:44:19 -05:00
Lars Wander f70d4079c1 provider/google: SSL Certificates resource + tests & documentation 2015-11-02 14:35:51 -05:00
Dave Cunningham 6ac8290f12 Merge pull request #3701 from lwander/f-gcp-global-address
provider/google: global address + tests & documentation
2015-11-02 13:29:36 -05:00
Brett Mack 8376a5a160 Merge branch 'terraform' 2015-11-02 13:57:44 +00:00
Brett Mack 8780bd269a Added vCloud Director provider with tests and provider documentation 2015-11-02 13:39:25 +00:00
Paul Hinze 3a7fa866c1 Merge pull request #3274 from stack72/aws-codecommit
provider/aws: CodeCommit - Currently only in us-east-1
2015-10-30 17:41:28 -05:00
Lars Wander 4ec1da4c86 provider/google: global address + tests & documentation 2015-10-30 17:57:09 -04:00
stack72 14604e432e Added the documentation for the CodeCommit repository 2015-10-30 21:39:16 +00:00
Lars Wander 07de5e7260 provider/google: SQL instance & database tests & documentation 2015-10-30 15:35:29 -04:00
Clint 5c3c1e2327 Merge pull request #3548 from MDL/aws_route
provider/aws: add aws_route resource (finish)
2015-10-29 17:06:56 -05:00
Paul Hinze 32ae193e94 Merge pull request #2778 from apparentlymart/tls
TLS utility provider
2015-10-29 14:51:06 -05:00
Radek Simko 7c4849541a aws: Add docs for aws_cloudtrail 2015-10-28 17:14:24 +00:00
Radek Simko 0d8d6fde79 Merge pull request #2636 from TimeIncOSS/f-aws-cloudformation
provider/aws: Add aws_cloudformation_stack
2015-10-28 16:16:14 +00:00
Paul Hinze 7f800f3498 website: docs for null_resource 2015-10-27 15:28:37 -05:00
Martin Atkins f6fd41e7b5 tls provider
As of this commit this provider has only logical resources that allow
the creation of private keys, self-signed certs and certificate requests.
These can be useful when creating other resources that use TLS
certificates, such as AWS Elastic Load Balancers.

Later it could grow to include support for real certificate provision from
CAs using the LetsEncrypt ACME protocol, once it is stable.
2015-10-22 21:48:32 -07:00
Martin Atkins f790309634 CodeDeploy links to the AWS provider sidebar.
Missed these when merging #2783.
2015-10-21 08:44:32 -07:00
gkze ac0afad6e9 Add aws_route resource 2015-10-19 09:16:26 -04:00
Paul Hinze 60e9bec052 Merge pull request #3483 from hashicorp/d-vsphere
vsphere docs; first draft
2015-10-15 09:21:32 -05:00
Paul Hinze 05d6c5b509 vsphere docs; first draft
I'm not familiar with vSphere so I had to skip over details in some
places, but this at least gets the basic structure in for the docs.
2015-10-15 09:18:05 -05:00