From 3a2f85f6834af80331dc5e4ded68ed1fbc7a47b2 Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 20 May 2023 20:15:57 +0200 Subject: [PATCH] feat: add license headers (+spdx id) --- .drone.yml | 3 +++ .hadolint.yaml | 3 +++ .pre-commit-config.yaml | 10 ++++++++++ Containerfile | 3 +++ app/app.go | 3 +++ app/assets.go | 3 +++ app/echoSettings.go | 3 +++ app/error.go | 3 +++ app/routes.go | 3 +++ app/routes_test.go | 3 +++ app/settings/helper.go | 3 +++ app/settings/settings.go | 3 +++ bs.js | 5 +++++ config/config.go | 3 +++ config/config_test.go | 3 +++ embed.go | 3 +++ ent/generate.go | 3 +++ ent/schema/hibp.go | 3 +++ ent/schema/setup.go | 3 +++ ent/schema/user.go | 3 +++ error.go | 3 +++ gen.go | 3 +++ handlers/config.go | 3 +++ handlers/error.go | 3 +++ handlers/handlers.go | 3 +++ handlers/home.go | 3 +++ handlers/icon.go | 3 +++ handlers/logout.go | 3 +++ handlers/page.go | 3 +++ handlers/signin.go | 3 +++ handlers/signup.go | 3 +++ handlers/type.go | 3 +++ justfile | 10 ++++++++++ main.go | 3 +++ modules/bluemonday/bluemonday.go | 3 +++ modules/db/db.go | 3 +++ modules/funcmap/funcmap.go | 3 +++ modules/funcmap/integrity.go | 3 +++ modules/password/password.go | 3 +++ modules/template/helper.go | 3 +++ modules/template/render.go | 3 +++ modules/template/template.go | 3 +++ modules/user/context.go | 3 +++ modules/user/user.go | 3 +++ modules/user/user_test.go | 3 +++ run.go | 3 +++ run_test.go | 3 +++ slogging/log.go | 3 +++ svgo.config.js | 5 +++++ tailwind.config.js | 5 +++++ 50 files changed, 170 insertions(+) diff --git a/.drone.yml b/.drone.yml index ff98812..9da44d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,7 @@ --- +# Copyright 2023 wanderer +# SPDX-License-Identifier: AGPL-3.0-only + kind: pipeline type: docker name: test archlinux diff --git a/.hadolint.yaml b/.hadolint.yaml index 9b70062..c9b03cc 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,3 +1,6 @@ +# Copyright 2023 wanderer +# SPDX-License-Identifier: AGPL-3.0-only + --- failure-threshold: warning ... diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d0bc74..8108c63 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,3 +22,13 @@ repos: rev: v0.0.1 hooks: - id: hadolint-container + - repo: local + hooks: + - id: addlicense + name: addlicence -check + entry: > + go run github.com/google/addlicense@v1.1.1 -check -v + pass_filenames: true + types_or: ["go", "yaml", "javascript", "dockerfile"] + exclude: "^(devenv.yaml|assets/.*|templates/.*)$" + language: system diff --git a/Containerfile b/Containerfile index a87f4ec..d2b6260 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,7 @@ # syntax=docker/dockerfile-upstream:master-labs +# Copyright 2023 wanderer +# SPDX-License-Identifier: AGPL-3.0-only + FROM docker.io/library/alpine:3.18.0 as dhall-cache ENV XDG_CACHE_HOME=/var/cache ENV DHALL_VERSION=1.42.0 diff --git a/app/app.go b/app/app.go index 3bd637c..8029d1e 100644 --- a/app/app.go +++ b/app/app.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import ( diff --git a/app/assets.go b/app/assets.go index d9bcf2c..f195455 100644 --- a/app/assets.go +++ b/app/assets.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import ( diff --git a/app/echoSettings.go b/app/echoSettings.go index d5c5136..2dea40e 100644 --- a/app/echoSettings.go +++ b/app/echoSettings.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import ( diff --git a/app/error.go b/app/error.go index d96fe7e..9ce5bed 100644 --- a/app/error.go +++ b/app/error.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import "errors" diff --git a/app/routes.go b/app/routes.go index 3268f44..77639b2 100644 --- a/app/routes.go +++ b/app/routes.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import ( diff --git a/app/routes_test.go b/app/routes_test.go index f421bde..d752463 100644 --- a/app/routes_test.go +++ b/app/routes_test.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package app import ( diff --git a/app/settings/helper.go b/app/settings/helper.go index fd4e4c5..60570b6 100644 --- a/app/settings/helper.go +++ b/app/settings/helper.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package settings import "flag" diff --git a/app/settings/settings.go b/app/settings/settings.go index cb15ce1..0c9735d 100644 --- a/app/settings/settings.go +++ b/app/settings/settings.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package settings import ( diff --git a/bs.js b/bs.js index e3fa863..f8af6d2 100644 --- a/bs.js +++ b/bs.js @@ -1,3 +1,8 @@ +/** + * Copyright 2023 wanderer + * SPDX-License-Identifier: AGPL-3.0-only + */ + /* |-------------------------------------------------------------------------- diff --git a/config/config.go b/config/config.go index b764e1d..5b25ac2 100644 --- a/config/config.go +++ b/config/config.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package config import ( diff --git a/config/config_test.go b/config/config_test.go index fc86124..6803aa5 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package config import ( diff --git a/embed.go b/embed.go index a9f976c..f02d84f 100644 --- a/embed.go +++ b/embed.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main import "embed" diff --git a/ent/generate.go b/ent/generate.go index 8d3fdfd..c55a09b 100644 --- a/ent/generate.go +++ b/ent/generate.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package ent //go:generate go run -mod=mod entgo.io/ent/cmd/ent generate ./schema diff --git a/ent/schema/hibp.go b/ent/schema/hibp.go index 49a423c..b5e3d32 100644 --- a/ent/schema/hibp.go +++ b/ent/schema/hibp.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package schema import ( diff --git a/ent/schema/setup.go b/ent/schema/setup.go index df47654..16ba7ca 100644 --- a/ent/schema/setup.go +++ b/ent/schema/setup.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package schema import ( diff --git a/ent/schema/user.go b/ent/schema/user.go index 18f397f..eba47cf 100644 --- a/ent/schema/user.go +++ b/ent/schema/user.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package schema import ( diff --git a/error.go b/error.go index ea895bd..1785017 100644 --- a/error.go +++ b/error.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main import "errors" diff --git a/gen.go b/gen.go index 4ad941e..19f4678 100644 --- a/gen.go +++ b/gen.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main //go:generate npm i diff --git a/handlers/config.go b/handlers/config.go index c45a671..1d1cf8d 100644 --- a/handlers/config.go +++ b/handlers/config.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/error.go b/handlers/error.go index 8a1be71..b171f27 100644 --- a/handlers/error.go +++ b/handlers/error.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/handlers.go b/handlers/handlers.go index 94dde96..d38af7b 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/home.go b/handlers/home.go index 43753a0..cee6925 100644 --- a/handlers/home.go +++ b/handlers/home.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/icon.go b/handlers/icon.go index 9bd35b9..6b838e7 100644 --- a/handlers/icon.go +++ b/handlers/icon.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers type Iconier interface { diff --git a/handlers/logout.go b/handlers/logout.go index 0a6a2c7..fa3acee 100644 --- a/handlers/logout.go +++ b/handlers/logout.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/page.go b/handlers/page.go index 33428ae..1695fd1 100644 --- a/handlers/page.go +++ b/handlers/page.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import moduser "git.dotya.ml/mirre-mt/pcmt/modules/user" diff --git a/handlers/signin.go b/handlers/signin.go index 39635a0..b73a5ef 100644 --- a/handlers/signin.go +++ b/handlers/signin.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/signup.go b/handlers/signup.go index 7af5d9a..3e28b05 100644 --- a/handlers/signup.go +++ b/handlers/signup.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers import ( diff --git a/handlers/type.go b/handlers/type.go index f0dd494..ced45f7 100644 --- a/handlers/type.go +++ b/handlers/type.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package handlers type userSignin struct { diff --git a/justfile b/justfile index e0dc9c8..f4c781b 100644 --- a/justfile +++ b/justfile @@ -47,6 +47,16 @@ prod: tw build gen: go generate -v ./ent +# add licence headers to source code files. +addlicense: + go run github.com/google/addlicense@v1.1.1 \ + -v -s=only \ + -c "wanderer " \ + -l "AGPL-3.0-only" \ + -ignore "tmp/**" -ignore "assets/**" -ignore "config/testdata/**" \ + -ignore "*.dhall" -ignore "node_modules/**" -ignore "devenv.yaml" \ + . + # start pg. dbstart: mkdir -p tmp/db diff --git a/main.go b/main.go index 5397172..d0f0e0a 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main import ( diff --git a/modules/bluemonday/bluemonday.go b/modules/bluemonday/bluemonday.go index d00f957..7c5232d 100644 --- a/modules/bluemonday/bluemonday.go +++ b/modules/bluemonday/bluemonday.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package bluemonday import "github.com/microcosm-cc/bluemonday" diff --git a/modules/db/db.go b/modules/db/db.go index 35525b3..1a35633 100644 --- a/modules/db/db.go +++ b/modules/db/db.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package db import ( diff --git a/modules/funcmap/funcmap.go b/modules/funcmap/funcmap.go index 50e5dc8..ea5b423 100644 --- a/modules/funcmap/funcmap.go +++ b/modules/funcmap/funcmap.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package funcmap import ( diff --git a/modules/funcmap/integrity.go b/modules/funcmap/integrity.go index 4e49254..1286d1e 100644 --- a/modules/funcmap/integrity.go +++ b/modules/funcmap/integrity.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package funcmap import ( diff --git a/modules/password/password.go b/modules/password/password.go index 3bf07ad..ca3ca8d 100644 --- a/modules/password/password.go +++ b/modules/password/password.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package password import "golang.org/x/crypto/bcrypt" diff --git a/modules/template/helper.go b/modules/template/helper.go index 1b50ef3..297b44c 100644 --- a/modules/template/helper.go +++ b/modules/template/helper.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package template import ( diff --git a/modules/template/render.go b/modules/template/render.go index 6262784..c1c7c5a 100644 --- a/modules/template/render.go +++ b/modules/template/render.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package template import ( diff --git a/modules/template/template.go b/modules/template/template.go index 121a1fa..195a807 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package template import ( diff --git a/modules/user/context.go b/modules/user/context.go index 53ee826..9f3214d 100644 --- a/modules/user/context.go +++ b/modules/user/context.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package user // CtxKey serves as a key to context values for this package. diff --git a/modules/user/user.go b/modules/user/user.go index dcdc48e..c0ce351 100644 --- a/modules/user/user.go +++ b/modules/user/user.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package user import ( diff --git a/modules/user/user_test.go b/modules/user/user_test.go index e08a840..754b0f5 100644 --- a/modules/user/user_test.go +++ b/modules/user/user_test.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package user import ( diff --git a/run.go b/run.go index 9e7ef87..4396389 100644 --- a/run.go +++ b/run.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main import ( diff --git a/run_test.go b/run_test.go index 8856b60..bf7539c 100644 --- a/run_test.go +++ b/run_test.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package main import ( diff --git a/slogging/log.go b/slogging/log.go index d354ae4..edc2701 100644 --- a/slogging/log.go +++ b/slogging/log.go @@ -1,3 +1,6 @@ +// Copyright 2023 wanderer +// SPDX-License-Identifier: AGPL-3.0-only + package slogging import ( diff --git a/svgo.config.js b/svgo.config.js index 40cd552..c2caa69 100644 --- a/svgo.config.js +++ b/svgo.config.js @@ -1,3 +1,8 @@ +/** + * Copyright 2023 wanderer + * SPDX-License-Identifier: AGPL-3.0-only + */ + module.exports = { multipass: true, plugins: [ diff --git a/tailwind.config.js b/tailwind.config.js index ffdf457..8845714 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,3 +1,8 @@ +/** + * Copyright 2023 wanderer + * SPDX-License-Identifier: AGPL-3.0-only + */ + /** @type {import('tailwindcss').Config} */ module.exports = { content: ["./templates/**.{tmpl,html}"],