Release/2.4.0

CHANGELOG

@@ -1,3 +1,13 @@
+Version 2.4.0 (2024-05-24)
+--------------------------
+Upgrade `alpine` base image version to 3.20.0
+Add support for OAuth2 in HTTP target (#325)
+Handle all 2XX HTTP response status codes as success (#324)
+Add SLULA config and env var (#321)
+Patch minor test issues (#322)
+Change license to SLULA (#317)
+Patch eventhub test (#318)
+
 Version 2.3.0 (2024-04-15)
 --------------------------
 Make kinesis source scaling checks configurable (#313)

Dockerfile.aws

@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM alpine:3.18.5
+FROM --platform=$TARGETPLATFORM alpine:3.20.0
 LABEL org.opencontainers.image.authors="Snowplow Analytics <support@snowplow.io>"
 
 ARG TARGETARCH

Dockerfile.main

@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM alpine:3.18.5
+FROM --platform=$TARGETPLATFORM alpine:3.20.0
 LABEL org.opencontainers.image.authors="Snowplow Analytics <support@snowplow.io>"
 
 ARG TARGETARCH

LICENSE.md

@@ -1,30 +1,36 @@
-# Snowplow Community License Agreement
+# Snowplow Limited Use License Agreement
 
-_Version 1.0, January 2023_
+_Version 1.0, January 2024_
 
-This Snowplow Community License Agreement, Version 1.0 (the “Agreement”) sets forth the terms on which Snowplow Analytics, Ltd. (“Snowplow”) makes available certain software made available by Snowplow under this Agreement (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.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.
 
 ## 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-sublicenseable 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 an Excluded Purpose. For purposes of this Agreement, “Excluded Purpose” means making available any on-premises or distributed software product, 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.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.2 Conditions.** In consideration of the License, Licensee’s distribution of the Software is subject to the following conditions:
+**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.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.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.3 Conditions.** In consideration of the License, Licensee’s use of the Software is subject to the following conditions:
 
 * **a.** Licensee must cause any Software modified by Licensee to carry prominent notices stating that Licensee modified the Software.
 
 * **b.** On each Software copy, Licensee shall reproduce and not remove or alter all Snowplow or third party copyright or other proprietary notices contained in the Software, and Licensee must include the notice below on each copy.
 
   ```
   This software is made available by Snowplow Analytics, Ltd.,
-  under the terms of the Snowplow Community License Agreement, Version 1.0
-  located at https://docs.snowplow.io/community-license-1.0
-  BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF THE SOFTWARE,
-  YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+  under the terms of the Snowplow Limited Use License Agreement, Version 1.0
+  located at https://docs.snowplow.io/limited-use-license-1.0
+  BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+  OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
   ```
 
-**1.3 Licensee Modifications.** Licensee may add its own copyright notices to modifications made by Licensee.
+**1.4 Licensee Modifications.** Licensee may add its own copyright notices to modifications made by Licensee.
 
-**1.4 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.
+**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
 
@@ -40,12 +46,12 @@ SNOWPLOW HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIE
 
 ## 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.
+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.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.
 
 **6.2. Assignment.** Licensee is not authorized to assign its rights under this Agreement to any third party. Snowplow may freely assign its rights under this Agreement to any third party.
 
-**6.3. Other.** This Agreement is the entire agreement between the parties regarding the subject matter hereof. No amendment or modification of this Agreement will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties. In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate. Waiver by Snowplow of a breach of any provision of this Agreement or the failure by Snowplow to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right.
+**6.3. Other.** This Agreement is the entire agreement between the parties regarding the subject matter hereof. No amendment or modification of this Agreement will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties. In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate. Waiver by Snowplow of a breach of any provision of this Agreement or the failure by Snowplow to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right.

README.md

@@ -18,5 +18,5 @@ The AWS-specific distribution contains everything, including the Kinesis source,
 
 To comply with the [Amazon Software License](https://github.com/twitchscience/kinsumer/blob/master/LICENSE), you may only use this distribution of Snowbridge _“with the web services, computing platforms or applications provided by Amazon.com, Inc. or its affiliates, including Amazon Web Services, Inc.”_
 
-[release-image]: http://img.shields.io/badge/golang-2.3.0-6ad7e5.svg?style=flat
+[release-image]: http://img.shields.io/badge/golang-2.4.0-6ad7e5.svg?style=flat
 [releases]: https://github.com/snowplow/snowbridge/releases/

VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

assets/docs/configuration/targets/http-full-example.hcl

@@ -41,5 +41,17 @@ target {
 
     # Whether to enable setting headers dynamically
     dynamic_headers            = true
+
+    # Optional. One of client credentials required when authorizing using OAuth2.
+    oauth2_client_id = env.CLIENT_ID
+
+    # Optional. One of client credentials required when authorizing using OAuth2.
+    oauth2_client_secret = env.CLIENT_SECRET
+
+    # Optional. Required when using OAuth2. Long-lived token used to generate new short-lived access token when previous one experies.
+    oauth2_refresh_token = env.REFRESH_TOKEN
+
+    # Optional. Required when using OAuth2. URL to authorization server providing access token. E.g. for Goggle API "https://oauth2.googleapis.com/token"  
+    oauth2_token_url = "https://my.auth.server/token"
   }
 }

assets/vars.go

@@ -1,9 +1,13 @@
-//
-// Copyright (c) 2020-present Snowplow Analytics Ltd. All rights reserved.
-//
-// This program is licensed to you under the Snowplow Community License Version 1.0,
-// and you may not use this file except in compliance with the Snowplow Community License Version 1.0.
-// You may obtain a copy of the Snowplow Community License Version 1.0 at https://docs.snowplow.io/community-license-1.0
+/**
+ * Copyright (c) 2020-present Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * 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
+ * BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+ * OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+ */
 
 package assets
 

cmd/aws/cli/main.go

@@ -1,9 +1,13 @@
-//
-// Copyright (c) 2020-present Snowplow Analytics Ltd. All rights reserved.
-//
-// This program is licensed to you under the Snowplow Community License Version 1.0,
-// and you may not use this file except in compliance with the Snowplow Community License Version 1.0.
-// You may obtain a copy of the Snowplow Community License Version 1.0 at https://docs.snowplow.io/community-license-1.0
+/**
+ * Copyright (c) 2020-present Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * 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
+ * BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+ * OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+ */
 
 package main
 

cmd/cli/cli.go

@@ -1,9 +1,13 @@
-//
-// Copyright (c) 2020-present Snowplow Analytics Ltd. All rights reserved.
-//
-// This program is licensed to you under the Snowplow Community License Version 1.0,
-// and you may not use this file except in compliance with the Snowplow Community License Version 1.0.
-// You may obtain a copy of the Snowplow Community License Version 1.0 at https://docs.snowplow.io/community-license-1.0
+/**
+ * Copyright (c) 2020-present Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * 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
+ * BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+ * OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+ */
 
 package cli
 

cmd/constants.go

@@ -1,15 +1,19 @@
-//
-// Copyright (c) 2020-present Snowplow Analytics Ltd. All rights reserved.
-//
-// This program is licensed to you under the Snowplow Community License Version 1.0,
-// and you may not use this file except in compliance with the Snowplow Community License Version 1.0.
-// You may obtain a copy of the Snowplow Community License Version 1.0 at https://docs.snowplow.io/community-license-1.0
+/**
+ * Copyright (c) 2020-present Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * 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
+ * BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+ * OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+ */
 
 package cmd
 
 const (
 	// AppVersion is the current version of the app
-	AppVersion = "2.3.0"
+	AppVersion = "2.4.0"
 
 	// AppName is the name of the application to use in logging / places that require the artifact
 	AppName = "snowbridge"

cmd/init.go

@@ -1,15 +1,20 @@
-//
-// Copyright (c) 2020-present Snowplow Analytics Ltd. All rights reserved.
-//
-// This program is licensed to you under the Snowplow Community License Version 1.0,
-// and you may not use this file except in compliance with the Snowplow Community License Version 1.0.
-// You may obtain a copy of the Snowplow Community License Version 1.0 at https://docs.snowplow.io/community-license-1.0
+/**
+ * Copyright (c) 2020-present Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * 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
+ * BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+ * OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+ */
 
 package cmd
 
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 
 	"github.com/getsentry/sentry-go"
 	"github.com/pkg/errors"
@@ -34,14 +39,20 @@ var (
 // and handles:
 //
 // 1. Loading the Config from the environment
-// 2. Configuring Sentry
-// 3. Configuring Logrus (+Logrus -> Sentry)
+// 2. Checking for licence acceptance
+// 3. Configuring Sentry
+// 4. Configuring Logrus (+Logrus -> Sentry)
 func Init() (*config.Config, bool, error) {
 	cfg, err := config.NewConfig()
 	if err != nil {
 		return nil, false, errors.Wrap(err, "Failed to build config")
 	}
 
+	// If licence not accepted, fail on startup
+	if !cfg.Data.Licence.Accept && !handleSLULAEnvVar() {
+		return nil, false, errors.New("please accept the terms of the Snowplow Limited Use License Agreement to proceed. See https://docs.snowplow.io/docs/destinations/forwarding-events/snowbridge/configuration/#license for more information on the license and how to configure this")
+	}
+
 	// Configure Sentry
 	sentryEnabled := cfg.Data.Sentry.Dsn != ""
 	if sentryEnabled {
@@ -78,3 +89,15 @@ func Init() (*config.Config, bool, error) {
 	log.Debugf("Config: %+v", cfg)
 	return cfg, sentryEnabled, nil
 }
+
+func handleSLULAEnvVar() bool {
+	foundVal := os.Getenv("ACCEPT_LIMITED_USE_LICENSE")
+	truthyVals := []string{"true", "yes", "on", "1"}
+
+	for _, truthyVal := range truthyVals {
+		if foundVal == truthyVal {
+			return true
+		}
+	}
+	return false
+}