4db8ef4a45
Merge pull request #3529 from hashicorp/b-aws-rds-copy-tags-to-snapshots
...
provider/aws: Add configuration to enable copying RDS tags to final snapshot
2015-10-30 09:09:41 -05:00
bf09edc642
provider/Azure: fixes:
...
added wait on instance deletion for associated blob deletion.
added guarding Mutex for secgroup-rule-related concurrent operations.
added usage warning on secgroup rules.
2015-10-30 02:57:47 +02:00
5c3c1e2327
Merge pull request #3548 from MDL/aws_route
...
provider/aws: add aws_route resource (finish)
2015-10-29 17:06:56 -05:00
79e6f2fc9d
Merge pull request #3683 from hashicorp/phinze/doc-vsphere-acctests
...
website: document vsphere acctest instructions
2015-10-29 14:53:47 -05:00
b1cf7f4841
Merge pull request #3682 from f440/update-logging-option
...
docs: Correct logging option example
2015-10-29 14:53:31 -05:00
32ae193e94
Merge pull request #2778 from apparentlymart/tls
...
TLS utility provider
2015-10-29 14:51:06 -05:00
cc0b941ba2
Merge pull request #3685 from stack72/f-aws-s3bucket-arn
...
Adding a computed ARN for the S3 Bucket as per #3666
2015-10-29 11:09:54 -05:00
8eec0c896f
Adding a computed ARN for the S3 Bucket as per #3666
2015-10-29 13:33:35 +00:00
cb2ecf5733
Merge pull request #3255 from Runscope/local-kinesis
...
provider/aws: allow local kinesis
2015-10-29 08:24:07 -05:00
be3dd42c9d
website: document vsphere acctest instructions
...
closes #3524
2015-10-29 07:48:11 -05:00
983e07cc17
docs: Correct logging option example
...
ref. 0090c063e8
2015-10-29 18:56:40 +09:00
678c7e905a
Merge pull request #3094 from TimeIncOSS/f-aws-cloudtrail
...
provider/aws: Add support for CloudTrail
2015-10-29 07:03:17 +00:00
9aeb04909c
Merge branch 'master' into pr-2836
...
* master: (335 commits)
Update CHANGELOG.md
config: return to the go1.5 generated lang/y.go
Update CHANGELOG.md
Allow cluster name, not only ARN for aws_ecs_service
Update CHANGELOG.md
Add check errors on reading CORS rules
Update CHANGELOG.md
website: docs for null_resource
dag: use hashcodes to as map key to edge sets
Update CHANGELOG.md
Update CHANGELOG.md
Update CHANGELOG.md
Use hc-releases
provider/google: Added scheduling block to compute_instance
Use vendored fastly logo
Use releases for releases
Update CHANGELOG.md
Update CHANGELOG.md
Update vpn.tf
Update CHANGELOG.md
...
2015-10-28 13:20:10 -05:00
7c4849541a
aws: Add docs for aws_cloudtrail
2015-10-28 17:14:24 +00:00
0d8d6fde79
Merge pull request #2636 from TimeIncOSS/f-aws-cloudformation
...
provider/aws: Add aws_cloudformation_stack
2015-10-28 16:16:14 +00:00
5cedd64a15
Merge pull request #3387 from kjmkznr/s3-cors
...
provider/aws: Add CORS settings to S3 bucket
2015-10-28 10:09:44 -05:00
fc3bda3651
Merge pull request #3659 from hashicorp/phinze/doc-null-resource
...
website: docs for null_resource
2015-10-27 16:16:25 -05:00
7f800f3498
website: docs for null_resource
2015-10-27 15:28:37 -05:00
66336f577a
Merge pull request #3643 from lwander/f-gcp-instance-scheduling
...
provider/google: Added scheduling block to compute_instance
2015-10-26 19:29:33 -04:00
5a311dbd11
provider/google: Added scheduling block to compute_instance
2015-10-26 16:16:06 -04:00
9cb1aada0a
Fixing page metadata for aws_route.
2015-10-26 13:26:47 -04:00
d86376c0ac
Fixing the cloudwatch_metric_alarm auto scale example
2015-10-23 08:22:46 -04:00
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
65cd53f70a
digitalocean: update index docs for do_token var
...
Updates the docs and clarifies the usage of `do_token` variable.
I was experiencing an issue mentioned here https://github.com/hashicorp/terraform/issues/124 and so adding more docs should be helpful.
2015-10-22 21:14:54 +02:00
ef161e1c1b
Various interpolation functions for CIDR range manipulation.
...
These new functions allow Terraform to be used for network address space
planning tasks, and make it easier to produce reusable modules that
contain or depend on network infrastructure.
For example:
- cidrsubnet allows an aws_subnet to derive its
CIDR prefix from its parent aws_vpc.
- cidrhost allows a fixed IP address for a resource to be assigned within
an address range defined elsewhere.
- cidrnetmask provides the dotted-decimal form of a prefix length that is
accepted by some systems such as routing tables and static network
interface configuration files.
The bulk of the work here is done by an external library I authored called
go-cidr. It is MIT licensed and was implemented primarily for the purpose
of using it within Terraform. It has its own unit tests and so the unit
tests within this change focus on simple success cases and on the correct
handling of the various error cases.
2015-10-22 08:10:52 -07:00
932f0ddbeb
Fix syntax errors in AWS CodeDeploy resource docs.
2015-10-21 09:45:48 -07:00
c0f44a7301
Merge #2783 : AWS Codeploy apps and deployment groups
2015-10-21 08:38:58 -07:00
dd56b39e0c
Codeploy deployment group app_name instead of application_name.
...
The corresponding resource is called aws_codeploy_app, so for consistency
we'll name the attribute app_name instead of application_name.
2015-10-21 08:34:46 -07:00
cccc5d03e3
Add lower / upper interpolation functions
2015-10-21 08:16:24 -07:00
0952505358
aws: Add docs for aws_codedeploy_deployment_group
2015-10-20 18:05:40 -04:00
fa3dfd1420
aws: Add documentation for "aws_codedeploy_app" resources.
2015-10-20 18:05:39 -04:00
484d6f8765
Merge pull request #3487 from nathan7/etcd
...
Etcd remote state backend
2015-10-19 18:42:29 -07:00
6a593f9d17
Fixing aws identifiers for aws_route.
...
Fixing basic acceptance test.
Adding warning to website about mixed mode.
Adding exists to aws_route.
Adding acceptance test for changing destination_cidr_block.
2015-10-19 09:16:27 -04:00
ac0afad6e9
Add aws_route resource
2015-10-19 09:16:26 -04:00
3021069207
Update init and remote config command docs
...
* Update init docs to be correct, and provide an example.
* Update remote config docs to provide more details about the Consul
backend and to provide another example.
2015-10-18 18:23:13 -05:00
362a2035c0
Document the etcd remote state backend
2015-10-18 23:24:56 +02:00
5930771615
Update compute_instance.html.markdown
...
Make it clear that you can't have two networks
2015-10-18 13:21:41 -04:00
20bc0ca3cd
document copy_tags
2015-10-16 11:20:24 -05:00
4017a611c3
docs: Glacier Vault - add title + make note more brief
2015-10-15 20:59:58 +02:00
26bc27594b
docs: Fix EFS documentation
2015-10-15 20:57:42 +02:00
9d41e6f3d1
vsphere docs: add warning about possible changes
...
Since we merged this so that the community could collaborate on
improvements, I thought it would be prudent to inform potential users of
the status of the provider so they know what to expect.
2015-10-15 09:35:06 -05:00
60e9bec052
Merge pull request #3483 from hashicorp/d-vsphere
...
vsphere docs; first draft
2015-10-15 09:21:32 -05:00
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
3708e752af
Merge pull request #3138 from mastor/master
...
Support tags for aws_db_subnet_group
2015-10-14 19:36:45 -07:00
1300f165b1
Merge pull request #3311 from caarlos0/allow-non-persistent-spot-requests
...
Allow non-persistent spot requests
2015-10-14 19:34:31 -07:00
a1939e70f7
Adding ignore_changes lifecycle meta property
2015-10-14 16:34:27 -05:00
5f6c03f515
Merge pull request #3191 from hashicorp/f-asg-wait-config
...
provider/aws: configurable capacity waiting duration
2015-10-14 10:34:55 -05:00
c51080d16b
Merge pull request #3210 from hashicorp/d-module-source-private-github-repos
...
doc: module sources from private github repos
2015-10-14 10:21:15 -05:00
46952b9c13
Merge pull request #3469 from squaresurf/doc-update
...
A script must have executable permissions.
2015-10-14 10:20:45 -05:00
e62d2c7aec
Merge pull request #3489 from gtheys/fix_doc_aws_elb_stickyness
...
fix illegal char in the policy name
2015-10-14 10:19:47 -05:00
9c2725e0a5
provider/aws: allow local kinesis
2015-10-13 14:29:50 -07:00
61948f35d2
provider/aws: Add docs for aws_cloudformation_stack
2015-10-13 22:55:09 +02:00
88e56479a5
docs: Make IAM policy doc canonical
2015-10-13 22:52:11 +02:00
43c7711ac8
docs/aws: Fix whitespacing in glacier_vault
2015-10-13 22:46:55 +02:00
2a7b8be9f3
Gofmt of the aws glacier vault resource
2015-10-13 14:58:29 +01:00
95d35ad77f
Adding the the docs for the Glacier Vault resource
...
Updating the glacier docs to include a link to the AWS developer guide
2015-10-13 14:58:29 +01:00
aaac9435ec
fix illegal char in the policy name
...
aws_lb_cookie_stickiness_policy.elbland: Error creating LBCookieStickinessPolicy: ValidationError: Policy name cannot contain characters that are not letters, or digits or the dash.
2015-10-13 12:57:22 +02:00
a811a72f11
provider/aws: fix force_delete on ASGs
...
The `ForceDelete` parameter was getting sent to the upstream API call,
but only after we had already finished draining instances from
Terraform, so it was a moot point by then.
This fixes that by skipping the drain when force_delete is true, and it
also simplifies the field config a bit:
* set a default of false to simplify the logic
* remove `ForceNew` since there's no need to replace the resource to
flip this value
* pull a detail comment from code into the docs
2015-10-12 17:10:01 -05:00
61721387b3
Merge pull request #3457 from TimeIncOSS/f-aws-ec2-placement-groups
...
provider/aws: Add support for EC2 Placement Group
2015-10-12 14:24:12 -05:00
8152f5822e
Merge pull request #3265 from stack72/aws-s3-bucket-update
...
provider/aws: Adding some other simple S3 Bucket Object (Optional) Inputs
2015-10-12 14:23:29 -05:00
51630aea26
Merge #3397 : Tags for AWS Kinesis Streams
2015-10-12 09:38:09 -07:00
36f78cc1dc
provider/aws: Allow tags for kinesis streams
2015-10-12 09:00:56 -07:00
3809cb5b88
Fixing the merge conflicts on the s3 bucket object resource after another PR had been merged
2015-10-12 16:51:27 +01:00
091d3fe206
Merge #3351 : aws_autoscaling_lifecycle_hook resource
2015-10-11 22:52:00 -07:00
7d600cadd2
Adding the docs for the autoscaling_lifecycle_hook
2015-10-11 20:42:14 -03:00
200a42ab46
Documentation of TF_LOG taking log levels.
...
As of 0090c063e
2015-10-11 10:56:45 -07:00
b62833e7b8
Add documentation for compact()
2015-10-11 16:47:48 +02:00
b7247026e9
Merge #3228 : aws_directory_service_directory resource
2015-10-10 18:09:17 -07:00
fd0174b031
Merge pull request #3415 from apparentlymart/heredoc-docs
...
Document that heredoc syntax is supported
2015-10-10 17:32:27 -07:00
a97036f3a3
Merge pull request #3383 from apparentlymart/docker-container-command-docs
...
Example for the command arg on docker_container.
2015-10-10 17:30:33 -07:00
5a91a765e9
Merge pull request #3367 from josephholsten/atlas-artifact
...
Update docs to show correct launching of atlas artifact in AWS.
2015-10-10 17:19:09 -07:00
a4fb080abe
Add missing `to_port` argument to website docs.
2015-10-10 14:54:59 -07:00
a888cd6f62
Merge pull request #3200 from zpatrick/master
...
Optional "content" argument for "s3_bucket_object"
2015-10-10 11:26:38 -07:00
444d63240b
Update page title for project.html.markdown
2015-10-09 17:43:10 -04:00
fd2d9371e9
A script must have executable permissions.
...
Why:
* The current example for passing arguments to a local script does not
include making the uploaded file executable.
This change addresses the need by:
* Add a step to make the uploaded script executable to the example
showing how to pass arguments to an uploaded script.
2015-10-09 11:27:38 -07:00
3143d1703d
Graphviz Workspace appears to be dead, so remove it from the docs.
2015-10-09 01:19:14 -04:00
f43ea74f4d
provider/aws: Add docs for aws_directory_service_directory
2015-10-08 17:06:39 -07:00
acb8d044a3
Add missing 'e'
2015-10-09 09:34:17 +13:00
78f76b993c
provider/aws: Add docs for aws_placement_group
2015-10-08 13:03:25 -07:00
0a5387db90
Adding some examples of the S3 bucket object parameters as well as checking for an empty string in the new S3 bucket object params
2015-10-08 17:24:33 +01:00
4962ef159b
Merge pull request #3036 from hashicorp/b-aws-eip-computed-instance
...
provider/aws: Allow Instance to be computed in EIPs
2015-10-08 09:38:26 -05:00
9d973f1279
document limitation of instance id / network interface id
2015-10-08 09:30:55 -05:00
8364827a36
Merge pull request #3443 from TimeIncOSS/f-aws-es
...
provider/aws: Add support for Elastic Search
2015-10-08 07:06:52 -07:00
cc921b0bc7
Small refactor for better readability and updated the docs
2015-10-08 10:09:11 +02:00
4ca3853824
Merge pull request #3277 from stack72/aws-app-cookieness-doc-update
...
docs: Updating the app_cookie_stickiness_policy docs to reflect needing a L…
2015-10-07 17:18:55 -07:00
e65ef8f13f
provider/aws: Add docs for aws_elasticsearch_domain
2015-10-07 16:57:46 -07:00
40f09b7cbd
Merge pull request #2260 from crunchywelch/packet_driver
...
Packet bare metal cloud hosting platform provider
2015-10-07 15:15:42 -05:00
2b75e65129
Update container.html.markdown
...
Correcting a misspelling in the docs.
2015-10-07 13:07:41 -07:00
7abe2a10e7
Fix spellng errorr
2015-10-07 11:26:23 -05:00
70841285c2
Update RDS Cluster for final snapshot, update tests/docs
2015-10-07 11:26:23 -05:00
77d8f87308
add publicly_accessible, update docs
2015-10-07 11:26:23 -05:00
5739c4869c
provider/aws: Docs for RDS Cluster, Cluster Instance
2015-10-07 11:26:23 -05:00
59c414d257
Merge pull request #2162 from apparentlymart/aws-opsworks-stackslayers
...
provider/aws: Opsworks Stacks and Layers
2015-10-06 15:24:00 -05:00
b816ed6c87
Merge pull request #3272 from lwander/f-gce-bucket-acls
...
provider/gce: Implemented bucket & object ACLs, as well as documentation and tests
2015-10-06 14:49:20 -04:00
f9fc89dfde
Merge pull request #3258 from lwander/f-gce-optional-region
...
provider/gce: Make region optional for remaining GCE resources
2015-10-06 14:48:36 -04:00
d15acb042c
Implemented bucket & object ACLs, as well as documentation and tests
2015-10-06 14:46:47 -04:00
1be8e85d44
Implements optional region for remaining GCE resources
2015-10-06 14:44:40 -04:00
4ede14ee3e
Correct VPC customer gw type in examples.
2015-10-06 13:39:39 -04:00
6c71504073
Various AWS OpsWorks layer resource types.
...
A "Layer" is a particular service that forms part of the infrastructure for
a set of applications. Some layers are application servers and others are
pure infrastructure, like MySQL servers or load balancers.
Although the AWS API only has one type called "Layer", it actually has
a number of different "soft" types that each have slightly different
validation rules and extra properties that are packed into the Attributes
map.
To make the validation rule differences explicit in Terraform, and to make
the Terraform structure more closely resemble the OpsWorks UI than its
API, we use a separate resource type per layer type, with the common code
factored out into a shared struct type.
2015-10-05 22:47:44 -07:00
4ce3d089fb
aws_opswork_stack resource type.
...
"Stack" is the root concept in OpsWorks, and acts as a container for a number
of different "layers" that each provide some service for an application.
A stack isn't very interesting on its own, but it needs to be created before
any layers can be created.
2015-10-05 22:47:44 -07:00
374070d066
website: docs for parallelism setting
...
/cc @stack72 @knuckolls @mitchellh
2015-10-05 17:21:29 -05:00
3e9e96286a
Document that heredoc syntax is supported.
...
Previously the only "documentation" I could find about this was a pull
request in the HCL repository.
2015-10-05 09:38:52 -07:00
d86c753cf1
provider/aws: Add docs for EFS resources
2015-10-03 19:35:07 -07:00
e849ec3af5
Example for the command arg on docker_container.
...
For those accustomed to running commands via a shell it may not be clear
why this argument is a list and what the elements of that list should be.
Hopefully giving an example will help people understand what is expected.
This is in response to the misunderstanding discovered in #3011 .
2015-10-03 18:03:04 -07:00
859c6c5e68
Merge #3233 : Allow canned ACLs on S3 remote state.
2015-10-03 17:40:17 -07:00
b8706a24d4
Merge #3156 : aws_iam_saml_provider resource
2015-10-03 17:29:25 -07:00
1896d71d59
Merge #3235 : elasticache cluster name to lowercase
2015-10-03 15:53:54 -07:00
0b85d35e87
Rename base64enc/dec to encode/decode.
...
There isn't any precedent for abbreviating words in the interpolation
function names, and it may not be clear to all users what "enc" and "dec"
are short for, so instead we'll prefer to spell out the whole words for
improved readability.
2015-10-03 15:12:51 -07:00
b4e0a8e225
Merge branch 'base64-interp-funcs'
2015-10-03 14:52:09 -07:00
c3d15a2336
Docs for base64 interpolation functions.
2015-10-03 14:49:50 -07:00
0af9a9f68f
Merge branch 'pr-3256'
...
* pr-3256:
docs: AWS launch configuration
2015-10-02 16:18:50 -05:00
e317d6ec7b
merge pr-3162
2015-10-02 16:02:58 -05:00
671b6e0f06
Merge pull request #3188 from miketheman/patch-1
...
Update aws_db_instance `db_subnet_group_name`
2015-10-02 15:56:45 -05:00
75c4ee06fc
Merge pull request #2415 from TimeIncOSS/f-aws-cloudwatch-log-group
...
provider/aws: Add cloudwatch_log_group
2015-10-02 15:16:57 -05:00
e0632de30c
Add support S3 CORS
2015-10-02 01:49:32 +09:00
1d6a5c5401
Update docs to show correct launching of atlas artifact in AWS.
2015-09-30 00:36:20 -07:00
dc27e3d10b
Adding a node to AWS AutoScale docs to make it clear that health_check_grace_period is a required field when setting ELB as the health_check_type
2015-09-28 10:51:36 +01:00
4e29025820
docs: rundeck: Remove extra backslashes
...
- it may not feel right, but that's currently how the builtin functions work -> double quotes are not escaped
- cc @apparentlymart
2015-09-25 10:51:55 +01:00
0d5a0bb45d
Merge pull request #3314 from apparentlymart/rundeck-doc-fix
...
Corrected example on rundeck provider index page
2015-09-25 10:47:03 +01:00
325f95839a
correct policy_document to policy in vpc_endpoint docs
2015-09-24 10:58:58 -04:00
7884fb805e
Corrected example on rundeck provider index page.
...
An earlier version of the provider implementation accepted
key_material_file instead of key_material. This was updated in the
resource-specific docs but not in this provider-wide example.
2015-09-23 17:31:38 -07:00
362024056f
docs
2015-09-23 15:35:47 -03:00
3c6faf068f
Allow setting the notification topic ARN for ElastiCache clusters.
2015-09-22 15:49:59 -04:00
ac42432690
docs: AWS launch configuration
...
* Spot instance documentation
2015-09-19 12:44:12 -07:00
72b0ffe22e
List of security groups should be ID/s not name/s
2015-09-18 14:43:53 +01:00
6337c350f5
Updating the app_cookie_stickiness_policy docs to reflact needing a LoadBalancer name NOT Id
2015-09-18 11:13:37 +01:00
f3f9ffea0b
Noticed some typos in the LaunchConfig docs when replying to a github issue earlier
2015-09-17 22:18:23 +01:00
1dfafe1840
Fixes typo
2015-09-17 14:51:05 -06:00
f0a3e8ed92
Merge branch 'master' of github.com:hashicorp/terraform
...
* 'master' of github.com:hashicorp/terraform:
Update CHANGELOG.md
Changing the ElastiCache Cluster configuration_engine to be on the cluster, not on the cache nodes
Adding configuration endpoint to the elasticache cluster nodes
2015-09-17 14:28:28 -05:00
b7cbd08e0c
provider/aws: Fix typo in VPN Connection docs
...
Fixes #3241
2015-09-17 14:28:12 -05:00
028e50bae6
Merge pull request #3250 from stack72/aws-elasticache-configuration_endpoint
...
Adding configuration endpoint to the elasticache cluster nodes
2015-09-17 14:27:10 -05:00
2b7a13b609
Adding some other simple S3 Bucket Object (Optional) Inputs
2015-09-17 20:13:06 +01:00
488738163b
Merge pull request #3240 from lwander/f-gce-bucket-website
...
provider/gce: Implement "website features" for GCE buckets
2015-09-16 17:37:32 -04:00
7b0626adb6
provider/aws: Add docs for CloudWatch Log Group
2015-09-16 22:28:01 +01:00
68c187c01e
Changing the ElastiCache Cluster configuration_engine to be on the cluster, not on the cache nodes
2015-09-16 17:15:31 +01:00
029f1fa572
Adding configuration endpoint to the elasticache cluster nodes
2015-09-16 13:06:54 +01:00
30c27362b1
Merge pull request #3213 from lwander/f-gce-vpn
...
provider/gce: VPN resources, documentation, tests and example
2015-09-15 16:29:41 -04:00
6850786422
Documentation and tests written for GCE VPN config
2015-09-15 16:13:48 -04:00
53e7058dee
Address issue #2292
2015-09-15 15:06:52 -04:00
55f3c8c764
provider/aws: aws_elasticache_cluster normalizes name to lowercase
2015-09-14 16:50:53 -07:00
4f7f20ba23
remote/s3: Add some docs for supported parameters
2015-09-14 10:40:53 +01:00
198e1a5186
remove various typos
2015-09-11 11:56:20 -07:00
863a7383aa
doc: module sources from private github repos
2015-09-10 16:14:25 -05:00
141c419cc7
Docs for aws_s3_bucket content argument.
2015-09-09 23:17:57 -07:00
b91df72371
Merge pull request #3192 from lwander/f-gcs-bucket-object
...
Allow GCE users to upload objects to buckets by file
2015-09-09 12:27:37 -04:00
602acadde8
Implemented GCS bucket objects
2015-09-08 16:57:18 -04:00
6cf126defa
Merge pull request #3020 from davemcdermid/azure-join-domain
...
Added join_domain feature to Azure Instance resource
2015-09-08 22:54:38 +02:00
506aae2f28
provider/aws: configurable capacity waiting duration
...
move wait for capacity timeout from a constant to a configurable
2015-09-08 13:22:42 -05:00
00ea29aea7
Updated documentation for Azure join-domain
2015-09-08 15:53:52 +01:00
10c96afa9b
Update aws_db_instance `db_subnet_group_name`
...
When launching a new RDS instance in a VPC-default AWS account, trying to control which VPC the new RDS instance lands in is not apparent from the parameters available.
The following works:
```
resource "aws_db_subnet_group" "foo" {
name = "foo"
description = "DB Subnet for foo"
subnet_ids = ["${aws_subnet.foo_1a.id}", "${aws_subnet.foo_1b.id}"]
}
resource "aws_db_instance" "bar" {
...
db_subnet_group_name = "${aws_db_subnet_group.foo.name}"
...
}
```
Hopefully this doc update will help others
2015-09-08 09:10:54 -04:00
Clint