From 27d4e3240e058f8740f29f4037133cb86a07c61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Sat, 4 May 2024 22:12:19 +0200 Subject: [PATCH] chore: add license info for code taken from other repos --- hcloudimages/backoff/backoff.go | 7 ++++--- hcloudimages/internal/control/retry.go | 7 ++++--- hcloudimages/internal/randomid/randomid.go | 7 ++++--- hcloudimages/internal/randomid/randomid_test.go | 4 ++++ hcloudimages/internal/sshkey/ssh_key.go | 7 ++++--- hcloudimages/internal/sshkey/ssh_key_test.go | 4 ++++ 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/hcloudimages/backoff/backoff.go b/hcloudimages/backoff/backoff.go index 9f73d91..310312a 100644 --- a/hcloudimages/backoff/backoff.go +++ b/hcloudimages/backoff/backoff.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MPL-2.0 +// From https://github.com/hetznercloud/terraform-provider-hcloud/blob/v1.46.1/internal/control/retry.go +// Copyright (c) Hetzner Cloud GmbH + package backoff import ( @@ -7,9 +11,6 @@ import ( "github.com/hetznercloud/hcloud-go/v2/hcloud" ) -// From https://github.com/hetznercloud/terraform-provider-hcloud/blob/v1.46.1/internal/control/retry.go -// Copyright (c) Hetzner Cloud GmbH - // ExponentialBackoffWithLimit returns a [hcloud.BackoffFunc] which implements an exponential // backoff. // It uses the formula: diff --git a/hcloudimages/internal/control/retry.go b/hcloudimages/internal/control/retry.go index a63f0ad..d053aee 100644 --- a/hcloudimages/internal/control/retry.go +++ b/hcloudimages/internal/control/retry.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MPL-2.0 +// From https://github.com/hetznercloud/terraform-provider-hcloud/blob/v1.46.1/internal/control/retry.go +// Copyright (c) Hetzner Cloud GmbH + package control import ( @@ -8,9 +12,6 @@ import ( "github.com/apricote/hcloud-upload-image/hcloudimages/contextlogger" ) -// From https://github.com/hetznercloud/terraform-provider-hcloud/blob/v1.46.1/internal/control/retry.go -// Copyright (c) Hetzner Cloud GmbH - // Retry executes f at most maxTries times. func Retry(ctx context.Context, maxTries int, f func() error) error { logger := contextlogger.From(ctx) diff --git a/hcloudimages/internal/randomid/randomid.go b/hcloudimages/internal/randomid/randomid.go index bdc42c5..9d0ab14 100644 --- a/hcloudimages/internal/randomid/randomid.go +++ b/hcloudimages/internal/randomid/randomid.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MIT +// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/random.go +// Copyright (c) 2024 Hetzner Cloud GmbH + package randomid import ( @@ -6,9 +10,6 @@ import ( "fmt" ) -// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/random.go -// Copyright (c) 2024 Hetzner Cloud GmbH - func Generate() (string, error) { b := make([]byte, 4) _, err := rand.Read(b) diff --git a/hcloudimages/internal/randomid/randomid_test.go b/hcloudimages/internal/randomid/randomid_test.go index 8887611..f96e07c 100644 --- a/hcloudimages/internal/randomid/randomid_test.go +++ b/hcloudimages/internal/randomid/randomid_test.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MIT +// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/random_test.go +// Copyright (c) 2024 Hetzner Cloud GmbH + package randomid import ( diff --git a/hcloudimages/internal/sshkey/ssh_key.go b/hcloudimages/internal/sshkey/ssh_key.go index eea0e02..e5c497f 100644 --- a/hcloudimages/internal/sshkey/ssh_key.go +++ b/hcloudimages/internal/sshkey/ssh_key.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MIT +// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/ssh_key.go +// Copyright (c) 2024 Hetzner Cloud GmbH + package sshkey import ( @@ -7,9 +11,6 @@ import ( "golang.org/x/crypto/ssh" ) -// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/ssh_key.go -// Copyright (c) 2024 Hetzner Cloud GmbH - func GenerateKeyPair() ([]byte, []byte, error) { pub, priv, err := ed25519.GenerateKey(nil) if err != nil { diff --git a/hcloudimages/internal/sshkey/ssh_key_test.go b/hcloudimages/internal/sshkey/ssh_key_test.go index dcc4b1e..926f4ed 100644 --- a/hcloudimages/internal/sshkey/ssh_key_test.go +++ b/hcloudimages/internal/sshkey/ssh_key_test.go @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: MIT +// From https://gitlab.com/hetznercloud/fleeting-plugin-hetzner/-/blob/0f60204582289c243599f8ca0f5be4822789131d/internal/utils/ssh_key_test.go +// Copyright (c) 2024 Hetzner Cloud GmbH + package sshkey import (