From f9521cfc3d78168642aa20829fe69f52ace7cbfb Mon Sep 17 00:00:00 2001 From: jbeemster Date: Fri, 3 Jan 2025 14:07:54 +0100 Subject: [PATCH 1/3] Update to SLULA v1.1 --- LICENSE | 30 ++++++++++++++++-------------- README.md | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index 6abbe69..0a7d3cc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,20 @@ # Snowplow Limited Use License Agreement -_Version 1.0, January 2024_ +_Version 1.1, November, 2024_ -This Snowplow Limited Use License Agreement, Version 1.0 (the “Agreement”) sets forth the terms on which Snowplow Analytics, Ltd. (“Snowplow”) makes available certain software (the “Software”). BY INSTALLING, DOWNLOADING, ACCESSING, OR USING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. IF YOU ARE RECEIVING THE SOFTWARE ON BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF SUCH ENTITY. “Licensee” means you, an individual, or the entity on whose behalf you are receiving the Software. +This Snowplow Limited Use License Agreement, Version 1.1 (the “Agreement”) sets forth the terms on which Snowplow Analytics, Ltd. (“Snowplow”) makes available certain software (the “Software”). BY INSTALLING, DOWNLOADING, ACCESSING, OR USING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. IF YOU ARE RECEIVING THE SOFTWARE ON BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF SUCH ENTITY. “Licensee” means you, an individual, or the entity on whose behalf you are receiving the Software. -## LICENSE GRANT AND CONDITIONS +## 1. LICENSE GRANT AND CONDITIONS -**1.1 License.** Subject to the terms and conditions of this Agreement, Snowplow hereby grants to Licensee a non-exclusive, royalty-free, worldwide, non-transferable, non-sublicensable license during the term of this Agreement to: (a) use the Software; (b) prepare modifications and derivative works of the Software; and (c) reproduce copies of the Software (the “License”). No right to distribute or make available the Software is granted under this License. Licensee is not granted the right to, and Licensee shall not, exercise the License for any Excluded Purpose. +**1.1 License.** Subject to the terms and conditions of this Agreement, Snowplow hereby grants to Licensee a non-exclusive, royalty-free, worldwide, non-transferable, non-sublicensable license during the term of this Agreement to: (a) use the Software; (b) prepare modifications and derivative works of the Software; and (c) reproduce copies of the Software (the “License”). No right to distribute or make available the Software is granted under this License. Licensee is not granted the right to, and Licensee shall not, exercise the License for any Competing Use, and Licensee may exercise the License only for Non-Production Use or Non-Commercial Use. -**1.2** For purposes of this Agreement, an “Excluded Purpose” is any use that is either a Competing Use or a Highly-Available Production Use, or both of them. +**1.2 Definitions.** For purposes of this Agreement: -* **1.2.1** A “Competing Use” is making available any on-premises or distributed software product, or any software-as-a-service, platform-as-a-service, infrastructure-as-a-service, or other similar online service, that competes with any products or services that Snowplow or any of its affiliates provides using the Software. +* **1.2.1** “Competing Use” is making available any on-premises or distributed software product, or any software-as-a-service, platform-as-a-service, infrastructure-as-a-service, or other similar online service, that competes with any products or services that Snowplow or any of its affiliates provides using the Software. -* **1.2.2** Highly-Available Production Use is any highly-available use, including without limitation any use where multiple instances of any Software component run concurrently to avoid a single point of failure, in a production environment, where production means use on live data. +* **1.2.2** “Non-Production Use” means any use of the Software to process test or synthetic data to evaluate the sufficiency of the Software for use by Licensee. + +* **1.2.3** “Non-Commercial Use” is only: (a) personal use for research, experiment, personal study, or hobby projects, without any anticipated commercial application, or (b) use for teaching purposes by lecturers of a school or university. **1.3 Conditions.** In consideration of the License, Licensee’s use of the Software is subject to the following conditions: @@ -22,8 +24,8 @@ This Snowplow Limited Use License Agreement, Version 1.0 (the “Agreement”) s ``` This software is made available by Snowplow Analytics, Ltd., - under the terms of the Snowplow Limited Use License Agreement, Version 1.0 - located at https://docs.snowplow.io/limited-use-license-1.0 + under the terms of the Snowplow Limited Use License Agreement, Version 1.1 + located at https://docs.snowplow.io/limited-use-license-1.1 BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT. ``` @@ -32,23 +34,23 @@ This Snowplow Limited Use License Agreement, Version 1.0 (the “Agreement”) s **1.5 No Sublicensing.** The License does not include the right to sublicense the Software, however, each recipient to which Licensee provides the Software may exercise the Licenses so long as such recipient agrees to the terms and conditions of this Agreement. -## TERM AND TERMINATION +## 2. TERM AND TERMINATION This Agreement will continue unless and until earlier terminated as set forth herein. If Licensee breaches any of its conditions or obligations under this Agreement, this Agreement will terminate automatically and the License will terminate automatically and permanently. -## INTELLECTUAL PROPERTY +## 3. INTELLECTUAL PROPERTY As between the parties, Snowplow will retain all right, title, and interest in the Software, and all intellectual property rights therein. Snowplow hereby reserves all rights not expressly granted to Licensee in this Agreement. Snowplow hereby reserves all rights in its trademarks and service marks, and no licenses therein are granted in this Agreement. -## DISCLAIMER +## 4. DISCLAIMER SNOWPLOW HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, AND SPECIFICALLY DISCLAIMS ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, WITH RESPECT TO THE SOFTWARE. -## LIMITATION OF LIABILITY +## 5. LIMITATION OF LIABILITY SNOWPLOW WILL NOT BE LIABLE FOR ANY DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO LOST PROFITS OR ANY CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ARISING OUT OF THIS AGREEMENT. THE FOREGOING SHALL APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW. -## GENERAL +## 6. GENERAL **6.1 Governing Law.** This Agreement will be governed by and interpreted in accordance with the laws of the state of Delaware, without reference to its conflict of laws principles. If Licensee is located within the United States, all disputes arising out of this Agreement are subject to the exclusive jurisdiction of courts located in Delaware, USA. If Licensee is located outside of the United States, any dispute, controversy or claim arising out of or relating to this Agreement will be referred to and finally determined by arbitration in accordance with the JAMS International Arbitration Rules. The tribunal will consist of one arbitrator. The place of arbitration will be in the State of Delaware, USA. The language to be used in the arbitral proceedings will be English. Judgment upon the award rendered by the arbitrator may be entered in any court having jurisdiction thereof. diff --git a/README.md b/README.md index 4e17605..a7f4705 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ Licensed under the [Snowplow Limited Use License Agreement][license]. _(If you a [ci]: https://github.com/snowplow-devops/terraform-google-collector-pubsub-ce/actions?query=workflow%3Aci [ci-image]: https://github.com/snowplow-devops/terraform-google-collector-pubsub-ce/workflows/ci/badge.svg -[license]: https://docs.snowplow.io/limited-use-license-1.0/ +[license]: https://docs.snowplow.io/limited-use-license-1.1/ [license-image]: https://img.shields.io/badge/license-Snowplow--Limited--Use-blue.svg?style=flat [license-faq]: https://docs.snowplow.io/docs/contributing/limited-use-license-faq/ From 0bf73ade0f8e0a481ca7442dc6c2a8b062759e28 Mon Sep 17 00:00:00 2001 From: jbeemster Date: Fri, 3 Jan 2025 14:13:53 +0100 Subject: [PATCH 2/3] Bump app_version to v3.3.0 --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 89b9154..73e5bb0 100644 --- a/variables.tf +++ b/variables.tf @@ -17,7 +17,7 @@ variable "name" { variable "app_version" { description = "App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value." type = string - default = "3.0.1" + default = "3.3.0" } variable "project_id" { From e06318682bd3079394fe12deb76d8415436c93ea Mon Sep 17 00:00:00 2001 From: jbeemster Date: Fri, 3 Jan 2025 14:14:44 +0100 Subject: [PATCH 3/3] Prepared for release --- CHANGELOG | 5 +++++ README.md | 6 +++--- main.tf | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 83a347f..4b799fb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Version 0.6.0 (2025-01-03) +--------------------------- +Update to SLULA v1.1 +Bump app_version to v3.3.0 + Version 0.5.1 (2024-06-03) -------------------------- Add support for shared VPC in central project (#31) diff --git a/README.md b/README.md index a7f4705..e596596 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ module "collector_lb" { | [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes | | [topic\_project\_id](#input\_topic\_project\_id) | The project ID in which the topics are deployed | `string` | n/a | yes | | [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no | -| [app\_version](#input\_app\_version) | App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value. | `string` | `"3.0.1"` | no | +| [app\_version](#input\_app\_version) | App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value. | `string` | `"3.3.0"` | no | | [associate\_public\_ip\_address](#input\_associate\_public\_ip\_address) | Whether to assign a public ip address to this instance; if false this instance must be behind a Cloud NAT to connect to the internet | `bool` | `true` | no | | [byte\_limit](#input\_byte\_limit) | The amount of bytes to buffer events before pushing them to PubSub | `number` | `1000000` | no | | [cookie\_domain](#input\_cookie\_domain) | Optional first party cookie domain for the collector to set cookies on (e.g. acme.com) | `string` | `""` | no | @@ -126,8 +126,8 @@ module "collector_lb" { | [network\_project\_id](#input\_network\_project\_id) | The project ID of the shared VPC in which the stack is being deployed | `string` | `""` | no | | [record\_limit](#input\_record\_limit) | The number of events to buffer before pushing them to PubSub | `number` | `500` | no | | [ssh\_block\_project\_keys](#input\_ssh\_block\_project\_keys) | Whether to block project wide SSH keys | `bool` | `true` | no | -| [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | 
[
  "0.0.0.0/0"
]
| no | -| [ssh\_key\_pairs](#input\_ssh\_key\_pairs) | The list of SSH key-pairs to add to the servers | 
list(object({
    user_name  = string
    public_key = string
  }))
| `[]` | no | +| [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | 
[
  "0.0.0.0/0"
]
| no | +| [ssh\_key\_pairs](#input\_ssh\_key\_pairs) | The list of SSH key-pairs to add to the servers | 
list(object({
    user_name  = string
    public_key = string
  }))
| `[]` | no | | [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within; if populated will override the 'network' setting | `string` | `""` | no | | [target\_size](#input\_target\_size) | The number of servers to deploy | `number` | `1` | no | | [telemetry\_enabled](#input\_telemetry\_enabled) | Whether or not to send telemetry information back to Snowplow Analytics Ltd | `bool` | `true` | no | diff --git a/main.tf b/main.tf index 743c928..1f5ea5a 100644 --- a/main.tf +++ b/main.tf @@ -1,6 +1,6 @@ locals { module_name = "collector-pubsub-ce" - module_version = "0.5.1" + module_version = "0.6.0" app_name = "stream-collector" app_version = var.app_version