From 6893c7f86ee268fba3a6f7c0d4105225ca386924 Mon Sep 17 00:00:00 2001 From: Shane Unruh Date: Fri, 4 Apr 2025 15:05:41 -0600 Subject: [PATCH 1/3] Changed the copyright to the OpenCHAMI copyright - Added MIT License similar to: https://github.com/OpenCHAMI/.github/blob/main/LICENSE - Editor automatically ran go fmt --- cmd/boot-script-service/oauth.go | 31 ++++++++++------ cmd/bss-init/main.go | 31 ++++++++++------ internal/postgres/bootparams.go | 33 ++++++++++------- internal/postgres/common.go | 31 ++++++++++------ internal/postgres/endpoints.go | 35 ++++++++++++------- internal/postgres/errors.go | 31 ++++++++++------ migrations/postgres/1_create_db_init.down.sql | 32 +++++++++++------ migrations/postgres/1_create_db_init.up.sql | 32 +++++++++++------ .../postgres/2_create_version1.down.sql | 30 ++++++++++------ migrations/postgres/2_create_version1.up.sql | 32 +++++++++++------ .../postgres/3_create_version2.down.sql | 30 ++++++++++------ migrations/postgres/3_create_version2.up.sql | 30 ++++++++++------ 12 files changed, 246 insertions(+), 132 deletions(-) diff --git a/cmd/boot-script-service/oauth.go b/cmd/boot-script-service/oauth.go index 5cd3308..daa861e 100644 --- a/cmd/boot-script-service/oauth.go +++ b/cmd/boot-script-service/oauth.go @@ -1,15 +1,24 @@ -// Copyright © 2024 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 -// for Los Alamos National Laboratory (LANL), which is operated by Triad -// National Security, LLC for the U.S. Department of Energy/National Nuclear -// Security Administration. All rights in the program are reserved by Triad -// National Security, LLC, and the U.S. Department of Energy/National Nuclear -// Security Administration. The Government is granted for itself and others -// acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license -// in this material to reproduce, prepare derivative works, distribute copies to -// the public, perform publicly and display publicly, and to permit others to do -// so. +// Copyright © 2024 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. package main diff --git a/cmd/bss-init/main.go b/cmd/bss-init/main.go index 532a343..71aaec3 100644 --- a/cmd/bss-init/main.go +++ b/cmd/bss-init/main.go @@ -1,14 +1,24 @@ -// Copyright © 2023 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 for -// Los Alamos National Laboratory (LANL), which is operated by Triad National -// Security, LLC for the U.S. Department of Energy/National Nuclear Security -// Administration. All rights in the program are reserved by Triad National -// Security, LLC, and the U.S. Department of Energy/National Nuclear Security -// Administration. The Government is granted for itself and others acting on its -// behalf a nonexclusive, paid-up, irrevocable worldwide license in this material -// to reproduce, prepare derivative works, distribute copies to the public, -// perform publicly and display publicly, and to permit others to do so. +// Copyright © 2023 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. /* * Boot Script Server Initializer @@ -30,7 +40,6 @@ import ( "strings" "time" - _ "github.com/lib/pq" "github.com/golang-migrate/migrate/v4" db "github.com/golang-migrate/migrate/v4/database" pg "github.com/golang-migrate/migrate/v4/database/postgres" diff --git a/internal/postgres/bootparams.go b/internal/postgres/bootparams.go index 5962974..15044f8 100644 --- a/internal/postgres/bootparams.go +++ b/internal/postgres/bootparams.go @@ -1,15 +1,24 @@ -// Copyright © 2024 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 -// for Los Alamos National Laboratory (LANL), which is operated by Triad -// National Security, LLC for the U.S. Department of Energy/National Nuclear -// Security Administration. All rights in the program are reserved by Triad -// National Security, LLC, and the U.S. Department of Energy/National Nuclear -// Security Administration. The Government is granted for itself and others -// acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license -// in this material to reproduce, prepare derivative works, distribute copies to -// the public, perform publicly and display publicly, and to permit others to do -// so. +// Copyright © 2024 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. package postgres @@ -18,10 +27,10 @@ import ( "fmt" "strings" + "github.com/Cray-HPE/hms-xname/xnames" "github.com/OpenCHAMI/bss/pkg/bssTypes" "github.com/docker/distribution/uuid" "github.com/jmoiron/sqlx" - "github.com/Cray-HPE/hms-xname/xnames" _ "github.com/lib/pq" ) diff --git a/internal/postgres/common.go b/internal/postgres/common.go index 1dd183d..062412b 100644 --- a/internal/postgres/common.go +++ b/internal/postgres/common.go @@ -1,15 +1,24 @@ -// Copyright © 2024 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 -// for Los Alamos National Laboratory (LANL), which is operated by Triad -// National Security, LLC for the U.S. Department of Energy/National Nuclear -// Security Administration. All rights in the program are reserved by Triad -// National Security, LLC, and the U.S. Department of Energy/National Nuclear -// Security Administration. The Government is granted for itself and others -// acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license -// in this material to reproduce, prepare derivative works, distribute copies to -// the public, perform publicly and display publicly, and to permit others to do -// so. +// Copyright © 2024 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. package postgres diff --git a/internal/postgres/endpoints.go b/internal/postgres/endpoints.go index 6eae5d4..929c2d6 100644 --- a/internal/postgres/endpoints.go +++ b/internal/postgres/endpoints.go @@ -1,15 +1,24 @@ -// Copyright © 2024 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 -// for Los Alamos National Laboratory (LANL), which is operated by Triad -// National Security, LLC for the U.S. Department of Energy/National Nuclear -// Security Administration. All rights in the program are reserved by Triad -// National Security, LLC, and the U.S. Department of Energy/National Nuclear -// Security Administration. The Government is granted for itself and others -// acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license -// in this material to reproduce, prepare derivative works, distribute copies to -// the public, perform publicly and display publicly, and to permit others to do -// so. +// Copyright © 2024 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. package postgres @@ -100,8 +109,8 @@ func (bddb BootDataDatabase) LogEndpointAccess(name string, endpointType bssType ts := time.Now() ea := EndpointAccess{ - Name: name, - Endpoint: string(endpointType), + Name: name, + Endpoint: string(endpointType), LastEpoch: ts.Unix(), } diff --git a/internal/postgres/errors.go b/internal/postgres/errors.go index 2a3b15a..a11ad98 100644 --- a/internal/postgres/errors.go +++ b/internal/postgres/errors.go @@ -1,15 +1,24 @@ -// Copyright © 2024 Triad National Security, LLC. All rights reserved. +// MIT License // -// This program was produced under U.S. Government contract 89233218CNA000001 -// for Los Alamos National Laboratory (LANL), which is operated by Triad -// National Security, LLC for the U.S. Department of Energy/National Nuclear -// Security Administration. All rights in the program are reserved by Triad -// National Security, LLC, and the U.S. Department of Energy/National Nuclear -// Security Administration. The Government is granted for itself and others -// acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license -// in this material to reproduce, prepare derivative works, distribute copies to -// the public, perform publicly and display publicly, and to permit others to do -// so. +// Copyright © 2024 Contributors to the OpenCHAMI Project +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. package postgres diff --git a/migrations/postgres/1_create_db_init.down.sql b/migrations/postgres/1_create_db_init.down.sql index 528b311..ff1e2a8 100644 --- a/migrations/postgres/1_create_db_init.down.sql +++ b/migrations/postgres/1_create_db_init.down.sql @@ -1,13 +1,23 @@ --- Copyright © 2023 Triad National Security, LLC. All rights reserved. --- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- MIT License +-- +-- Copyright © 2023 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. -- DROP SCHEMA IF EXISTS bssdb; diff --git a/migrations/postgres/1_create_db_init.up.sql b/migrations/postgres/1_create_db_init.up.sql index 4e0109f..0a37a3e 100644 --- a/migrations/postgres/1_create_db_init.up.sql +++ b/migrations/postgres/1_create_db_init.up.sql @@ -1,13 +1,23 @@ --- Copyright © 2023 Triad National Security, LLC. All rights reserved. --- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- MIT License +-- +-- Copyright © 2023 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. -- CREATE SCHEMA IF NOT EXISTS bssdb; diff --git a/migrations/postgres/2_create_version1.down.sql b/migrations/postgres/2_create_version1.down.sql index f996efa..9c0836c 100644 --- a/migrations/postgres/2_create_version1.down.sql +++ b/migrations/postgres/2_create_version1.down.sql @@ -1,14 +1,24 @@ --- Copyright © 2023 Triad National Security, LLC. All rights reserved. +-- MIT License -- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- Copyright © 2023 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. BEGIN; diff --git a/migrations/postgres/2_create_version1.up.sql b/migrations/postgres/2_create_version1.up.sql index 92b306f..8e5a606 100644 --- a/migrations/postgres/2_create_version1.up.sql +++ b/migrations/postgres/2_create_version1.up.sql @@ -1,14 +1,24 @@ --- Copyright © 2023 Triad National Security, LLC. All rights reserved. --- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- MIT License +-- +-- Copyright © 2023 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. BEGIN; diff --git a/migrations/postgres/3_create_version2.down.sql b/migrations/postgres/3_create_version2.down.sql index 4516c7b..7cccb08 100644 --- a/migrations/postgres/3_create_version2.down.sql +++ b/migrations/postgres/3_create_version2.down.sql @@ -1,14 +1,24 @@ --- Copyright © 2024 Triad National Security, LLC. All rights reserved. +-- MIT License -- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- Copyright © 2024 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. BEGIN; diff --git a/migrations/postgres/3_create_version2.up.sql b/migrations/postgres/3_create_version2.up.sql index 2d25c98..ab9e25f 100644 --- a/migrations/postgres/3_create_version2.up.sql +++ b/migrations/postgres/3_create_version2.up.sql @@ -1,14 +1,24 @@ --- Copyright © 2024 Triad National Security, LLC. All rights reserved. +-- MIT License -- --- This program was produced under U.S. Government contract 89233218CNA000001 for --- Los Alamos National Laboratory (LANL), which is operated by Triad National --- Security, LLC for the U.S. Department of Energy/National Nuclear Security --- Administration. All rights in the program are reserved by Triad National --- Security, LLC, and the U.S. Department of Energy/National Nuclear Security --- Administration. The Government is granted for itself and others acting on its --- behalf a nonexclusive, paid-up, irrevocable worldwide license in this material --- to reproduce, prepare derivative works, distribute copies to the public, --- perform publicly and display publicly, and to permit others to do so. +-- Copyright © 2024 Contributors to the OpenCHAMI Project +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in all +-- copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-- SOFTWARE. BEGIN; From 9286bc4b69688345d72cf04f0cf0022f91718721 Mon Sep 17 00:00:00 2001 From: Shane Unruh Date: Fri, 4 Apr 2025 15:41:49 -0600 Subject: [PATCH 2/3] Added built files to .gitignore - Added the binaries and .version file to .gitignore - Added .version to the make clean target --- .gitignore | 4 ++++ Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a93bf7e..f1b3e14 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ kubernetes/.packaged/ *.pem dist/ +# files built by make binaries +/.version +/boot-script-service +/bss-init diff --git a/Makefile b/Makefile index 62fbbad..2bc30ad 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ version: .PHONY: clean clean: - rm -f $(BINARIES) + rm -f $(BINARIES) .version .PHONY: snyk snyk: From 7a83b4b06326a6ea4acbec67cd28c984569cfa70 Mon Sep 17 00:00:00 2001 From: Shane Unruh Date: Thu, 10 Apr 2025 14:11:02 -0600 Subject: [PATCH 3/3] Updated the copyrights to include 2025 --- cmd/boot-script-service/oauth.go | 2 +- cmd/bss-init/main.go | 2 +- internal/postgres/bootparams.go | 2 +- internal/postgres/common.go | 2 +- internal/postgres/endpoints.go | 2 +- internal/postgres/errors.go | 2 +- migrations/postgres/1_create_db_init.down.sql | 2 +- migrations/postgres/1_create_db_init.up.sql | 2 +- migrations/postgres/2_create_version1.down.sql | 2 +- migrations/postgres/2_create_version1.up.sql | 2 +- migrations/postgres/3_create_version2.down.sql | 2 +- migrations/postgres/3_create_version2.up.sql | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/boot-script-service/oauth.go b/cmd/boot-script-service/oauth.go index daa861e..8467b5f 100644 --- a/cmd/boot-script-service/oauth.go +++ b/cmd/boot-script-service/oauth.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2024 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/bss-init/main.go b/cmd/bss-init/main.go index 71aaec3..874d583 100644 --- a/cmd/bss-init/main.go +++ b/cmd/bss-init/main.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2023 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/internal/postgres/bootparams.go b/internal/postgres/bootparams.go index 15044f8..022bc60 100644 --- a/internal/postgres/bootparams.go +++ b/internal/postgres/bootparams.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2024 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/internal/postgres/common.go b/internal/postgres/common.go index 062412b..fed1c0e 100644 --- a/internal/postgres/common.go +++ b/internal/postgres/common.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2024 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/internal/postgres/endpoints.go b/internal/postgres/endpoints.go index 929c2d6..f767ea9 100644 --- a/internal/postgres/endpoints.go +++ b/internal/postgres/endpoints.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2024 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/internal/postgres/errors.go b/internal/postgres/errors.go index a11ad98..1d6b952 100644 --- a/internal/postgres/errors.go +++ b/internal/postgres/errors.go @@ -1,6 +1,6 @@ // MIT License // -// Copyright © 2024 Contributors to the OpenCHAMI Project +// Copyright © 2024-2025 Contributors to the OpenCHAMI Project // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/1_create_db_init.down.sql b/migrations/postgres/1_create_db_init.down.sql index ff1e2a8..3efd52e 100644 --- a/migrations/postgres/1_create_db_init.down.sql +++ b/migrations/postgres/1_create_db_init.down.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2023 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/1_create_db_init.up.sql b/migrations/postgres/1_create_db_init.up.sql index 0a37a3e..3a5d23a 100644 --- a/migrations/postgres/1_create_db_init.up.sql +++ b/migrations/postgres/1_create_db_init.up.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2023 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/2_create_version1.down.sql b/migrations/postgres/2_create_version1.down.sql index 9c0836c..8994cd4 100644 --- a/migrations/postgres/2_create_version1.down.sql +++ b/migrations/postgres/2_create_version1.down.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2023 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/2_create_version1.up.sql b/migrations/postgres/2_create_version1.up.sql index 8e5a606..502e956 100644 --- a/migrations/postgres/2_create_version1.up.sql +++ b/migrations/postgres/2_create_version1.up.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2023 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/3_create_version2.down.sql b/migrations/postgres/3_create_version2.down.sql index 7cccb08..e8fb8fe 100644 --- a/migrations/postgres/3_create_version2.down.sql +++ b/migrations/postgres/3_create_version2.down.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2024 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal diff --git a/migrations/postgres/3_create_version2.up.sql b/migrations/postgres/3_create_version2.up.sql index ab9e25f..c626347 100644 --- a/migrations/postgres/3_create_version2.up.sql +++ b/migrations/postgres/3_create_version2.up.sql @@ -1,6 +1,6 @@ -- MIT License -- --- Copyright © 2024 Contributors to the OpenCHAMI Project +-- Copyright © 2024-2025 Contributors to the OpenCHAMI Project -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal