Skip to content

Commit aa1f5c0

Browse files
committed
build: update libs
1 parent e28958c commit aa1f5c0

29 files changed

+365
-420
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI
22
# ~~
3-
# https://github.com/kunitsuinc/ccc/workflows/CI/badge.svg
3+
# https://github.com/kunitsucom/ccc/workflows/CI/badge.svg
44
# ~~
55

66
on:

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ linters-settings:
3030
ignoreSigs:
3131
- func errors.New(text string) error
3232
- func fmt.Errorf(format string, a ...any) error
33-
- func github.com/kunitsuinc/ccc/pkg/errors.Errorf(format string, a ...interface{}) error
33+
- func github.com/kunitsucom/ccc/pkg/errors.Errorf(format string, a ...interface{}) error
3434

3535
issues:
3636
exclude-rules:

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.19.1
1+
golang 1.21.0

CREDITS

+32-211
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,35 @@ https://cloud.google.com/go/storage
12791279

12801280
================================================================
12811281

1282+
git.sr.ht/~sbinet/cmpimg
1283+
https://git.sr.ht/~sbinet/cmpimg
1284+
----------------------------------------------------------------
1285+
Copyright ©2023 The cmpimg Authors. All rights reserved.
1286+
1287+
Redistribution and use in source and binary forms, with or without
1288+
modification, are permitted provided that the following conditions are met:
1289+
* Redistributions of source code must retain the above copyright
1290+
notice, this list of conditions and the following disclaimer.
1291+
* Redistributions in binary form must reproduce the above copyright
1292+
notice, this list of conditions and the following disclaimer in the
1293+
documentation and/or other materials provided with the distribution.
1294+
* Neither the name of the cmpimg project nor the names of its authors and
1295+
contributors may be used to endorse or promote products derived from this
1296+
software without specific prior written permission.
1297+
1298+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1299+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1300+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1301+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
1302+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1303+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1304+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1305+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
1306+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1307+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1308+
1309+
================================================================
1310+
12821311
git.sr.ht/~sbinet/gg
12831312
https://git.sr.ht/~sbinet/gg
12841313
----------------------------------------------------------------
@@ -2439,216 +2468,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24392468

24402469
================================================================
24412470

2442-
github.com/googleapis/go-type-adapters
2443-
https://github.com/googleapis/go-type-adapters
2444-
----------------------------------------------------------------
2445-
2446-
Apache License
2447-
Version 2.0, January 2004
2448-
http://www.apache.org/licenses/
2449-
2450-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
2451-
2452-
1. Definitions.
2453-
2454-
"License" shall mean the terms and conditions for use, reproduction,
2455-
and distribution as defined by Sections 1 through 9 of this document.
2456-
2457-
"Licensor" shall mean the copyright owner or entity authorized by
2458-
the copyright owner that is granting the License.
2459-
2460-
"Legal Entity" shall mean the union of the acting entity and all
2461-
other entities that control, are controlled by, or are under common
2462-
control with that entity. For the purposes of this definition,
2463-
"control" means (i) the power, direct or indirect, to cause the
2464-
direction or management of such entity, whether by contract or
2465-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
2466-
outstanding shares, or (iii) beneficial ownership of such entity.
2467-
2468-
"You" (or "Your") shall mean an individual or Legal Entity
2469-
exercising permissions granted by this License.
2470-
2471-
"Source" form shall mean the preferred form for making modifications,
2472-
including but not limited to software source code, documentation
2473-
source, and configuration files.
2474-
2475-
"Object" form shall mean any form resulting from mechanical
2476-
transformation or translation of a Source form, including but
2477-
not limited to compiled object code, generated documentation,
2478-
and conversions to other media types.
2479-
2480-
"Work" shall mean the work of authorship, whether in Source or
2481-
Object form, made available under the License, as indicated by a
2482-
copyright notice that is included in or attached to the work
2483-
(an example is provided in the Appendix below).
2484-
2485-
"Derivative Works" shall mean any work, whether in Source or Object
2486-
form, that is based on (or derived from) the Work and for which the
2487-
editorial revisions, annotations, elaborations, or other modifications
2488-
represent, as a whole, an original work of authorship. For the purposes
2489-
of this License, Derivative Works shall not include works that remain
2490-
separable from, or merely link (or bind by name) to the interfaces of,
2491-
the Work and Derivative Works thereof.
2492-
2493-
"Contribution" shall mean any work of authorship, including
2494-
the original version of the Work and any modifications or additions
2495-
to that Work or Derivative Works thereof, that is intentionally
2496-
submitted to Licensor for inclusion in the Work by the copyright owner
2497-
or by an individual or Legal Entity authorized to submit on behalf of
2498-
the copyright owner. For the purposes of this definition, "submitted"
2499-
means any form of electronic, verbal, or written communication sent
2500-
to the Licensor or its representatives, including but not limited to
2501-
communication on electronic mailing lists, source code control systems,
2502-
and issue tracking systems that are managed by, or on behalf of, the
2503-
Licensor for the purpose of discussing and improving the Work, but
2504-
excluding communication that is conspicuously marked or otherwise
2505-
designated in writing by the copyright owner as "Not a Contribution."
2506-
2507-
"Contributor" shall mean Licensor and any individual or Legal Entity
2508-
on behalf of whom a Contribution has been received by Licensor and
2509-
subsequently incorporated within the Work.
2510-
2511-
2. Grant of Copyright License. Subject to the terms and conditions of
2512-
this License, each Contributor hereby grants to You a perpetual,
2513-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2514-
copyright license to reproduce, prepare Derivative Works of,
2515-
publicly display, publicly perform, sublicense, and distribute the
2516-
Work and such Derivative Works in Source or Object form.
2517-
2518-
3. Grant of Patent License. Subject to the terms and conditions of
2519-
this License, each Contributor hereby grants to You a perpetual,
2520-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2521-
(except as stated in this section) patent license to make, have made,
2522-
use, offer to sell, sell, import, and otherwise transfer the Work,
2523-
where such license applies only to those patent claims licensable
2524-
by such Contributor that are necessarily infringed by their
2525-
Contribution(s) alone or by combination of their Contribution(s)
2526-
with the Work to which such Contribution(s) was submitted. If You
2527-
institute patent litigation against any entity (including a
2528-
cross-claim or counterclaim in a lawsuit) alleging that the Work
2529-
or a Contribution incorporated within the Work constitutes direct
2530-
or contributory patent infringement, then any patent licenses
2531-
granted to You under this License for that Work shall terminate
2532-
as of the date such litigation is filed.
2533-
2534-
4. Redistribution. You may reproduce and distribute copies of the
2535-
Work or Derivative Works thereof in any medium, with or without
2536-
modifications, and in Source or Object form, provided that You
2537-
meet the following conditions:
2538-
2539-
(a) You must give any other recipients of the Work or
2540-
Derivative Works a copy of this License; and
2541-
2542-
(b) You must cause any modified files to carry prominent notices
2543-
stating that You changed the files; and
2544-
2545-
(c) You must retain, in the Source form of any Derivative Works
2546-
that You distribute, all copyright, patent, trademark, and
2547-
attribution notices from the Source form of the Work,
2548-
excluding those notices that do not pertain to any part of
2549-
the Derivative Works; and
2550-
2551-
(d) If the Work includes a "NOTICE" text file as part of its
2552-
distribution, then any Derivative Works that You distribute must
2553-
include a readable copy of the attribution notices contained
2554-
within such NOTICE file, excluding those notices that do not
2555-
pertain to any part of the Derivative Works, in at least one
2556-
of the following places: within a NOTICE text file distributed
2557-
as part of the Derivative Works; within the Source form or
2558-
documentation, if provided along with the Derivative Works; or,
2559-
within a display generated by the Derivative Works, if and
2560-
wherever such third-party notices normally appear. The contents
2561-
of the NOTICE file are for informational purposes only and
2562-
do not modify the License. You may add Your own attribution
2563-
notices within Derivative Works that You distribute, alongside
2564-
or as an addendum to the NOTICE text from the Work, provided
2565-
that such additional attribution notices cannot be construed
2566-
as modifying the License.
2567-
2568-
You may add Your own copyright statement to Your modifications and
2569-
may provide additional or different license terms and conditions
2570-
for use, reproduction, or distribution of Your modifications, or
2571-
for any such Derivative Works as a whole, provided Your use,
2572-
reproduction, and distribution of the Work otherwise complies with
2573-
the conditions stated in this License.
2574-
2575-
5. Submission of Contributions. Unless You explicitly state otherwise,
2576-
any Contribution intentionally submitted for inclusion in the Work
2577-
by You to the Licensor shall be under the terms and conditions of
2578-
this License, without any additional terms or conditions.
2579-
Notwithstanding the above, nothing herein shall supersede or modify
2580-
the terms of any separate license agreement you may have executed
2581-
with Licensor regarding such Contributions.
2582-
2583-
6. Trademarks. This License does not grant permission to use the trade
2584-
names, trademarks, service marks, or product names of the Licensor,
2585-
except as required for reasonable and customary use in describing the
2586-
origin of the Work and reproducing the content of the NOTICE file.
2587-
2588-
7. Disclaimer of Warranty. Unless required by applicable law or
2589-
agreed to in writing, Licensor provides the Work (and each
2590-
Contributor provides its Contributions) on an "AS IS" BASIS,
2591-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
2592-
implied, including, without limitation, any warranties or conditions
2593-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
2594-
PARTICULAR PURPOSE. You are solely responsible for determining the
2595-
appropriateness of using or redistributing the Work and assume any
2596-
risks associated with Your exercise of permissions under this License.
2597-
2598-
8. Limitation of Liability. In no event and under no legal theory,
2599-
whether in tort (including negligence), contract, or otherwise,
2600-
unless required by applicable law (such as deliberate and grossly
2601-
negligent acts) or agreed to in writing, shall any Contributor be
2602-
liable to You for damages, including any direct, indirect, special,
2603-
incidental, or consequential damages of any character arising as a
2604-
result of this License or out of the use or inability to use the
2605-
Work (including but not limited to damages for loss of goodwill,
2606-
work stoppage, computer failure or malfunction, or any and all
2607-
other commercial damages or losses), even if such Contributor
2608-
has been advised of the possibility of such damages.
2609-
2610-
9. Accepting Warranty or Additional Liability. While redistributing
2611-
the Work or Derivative Works thereof, You may choose to offer,
2612-
and charge a fee for, acceptance of support, warranty, indemnity,
2613-
or other liability obligations and/or rights consistent with this
2614-
License. However, in accepting such obligations, You may act only
2615-
on Your own behalf and on Your sole responsibility, not on behalf
2616-
of any other Contributor, and only if You agree to indemnify,
2617-
defend, and hold each Contributor harmless for any liability
2618-
incurred by, or claims asserted against, such Contributor by reason
2619-
of your accepting any such warranty or additional liability.
2620-
2621-
END OF TERMS AND CONDITIONS
2622-
2623-
APPENDIX: How to apply the Apache License to your work.
2624-
2625-
To apply the Apache License to your work, attach the following
2626-
boilerplate notice, with the fields enclosed by brackets "[]"
2627-
replaced with your own identifying information. (Don't include
2628-
the brackets!) The text should be enclosed in the appropriate
2629-
comment syntax for the file format. We also recommend that a
2630-
file or class name and description of purpose be included on the
2631-
same "printed page" as the copyright notice for easier
2632-
identification within third-party archives.
2633-
2634-
Copyright [yyyy] [name of copyright owner]
2635-
2636-
Licensed under the Apache License, Version 2.0 (the "License");
2637-
you may not use this file except in compliance with the License.
2638-
You may obtain a copy of the License at
2639-
2640-
https://www.apache.org/licenses/LICENSE-2.0
2641-
2642-
Unless required by applicable law or agreed to in writing, software
2643-
distributed under the License is distributed on an "AS IS" BASIS,
2644-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2645-
See the License for the specific language governing permissions and
2646-
limitations under the License.
2647-
2648-
================================================================
2649-
2650-
github.com/kunitsuinc/util.go
2651-
https://github.com/kunitsuinc/util.go
2471+
github.com/kunitsucom/util.go
2472+
https://github.com/kunitsucom/util.go
26522473
----------------------------------------------------------------
26532474
Apache License
26542475
Version 2.0, January 2004
@@ -2838,7 +2659,7 @@ https://github.com/kunitsuinc/util.go
28382659
same "printed page" as the copyright notice for easier
28392660
identification within third-party archives.
28402661

2841-
Copyright 2022 kunitsuinc
2662+
Copyright 2022 kunitsucom
28422663

28432664
Licensed under the Apache License, Version 2.0 (the "License");
28442665
you may not use this file except in compliance with the License.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2022 kunitsuinc
189+
Copyright 2022 kunitsucom
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHELL := /usr/bin/env bash -Eeu -o pipefail
22
GITROOT := $(shell git rev-parse --show-toplevel || pwd || echo '.')
33
PRE_PUSH := ${GITROOT}/.git/hooks/pre-push
4-
GOMODULE := github.com/kunitsuinc/ccc
4+
GOMODULE := github.com/kunitsucom/ccc
55
VERSION := $(shell git describe --tags --abbrev=0 --always)
66
REVISION := $(shell git log -1 --format='%H')
77
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)

README.md

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# ccc - Cloud Cost Checker
22

3-
[![license](https://img.shields.io/github/license/kunitsuinc/ccc)](LICENSE)
4-
[![pkg](https://pkg.go.dev/badge/github.com/kunitsuinc/ccc)](https://pkg.go.dev/github.com/kunitsuinc/ccc)
5-
[![goreportcard](https://goreportcard.com/badge/github.com/kunitsuinc/ccc)](https://goreportcard.com/report/github.com/kunitsuinc/ccc)
6-
[![workflow](https://github.com/kunitsuinc/ccc/workflows/CI/badge.svg)](https://github.com/kunitsuinc/ccc/tree/main)
7-
[![codecov](https://codecov.io/gh/kunitsuinc/ccc/branch/main/graph/badge.svg?token=4UML9FB7BX)](https://codecov.io/gh/kunitsuinc/ccc)
8-
[![sourcegraph](https://sourcegraph.com/github.com/kunitsuinc/ccc/-/badge.svg)](https://sourcegraph.com/github.com/kunitsuinc/ccc)
3+
[![license](https://img.shields.io/github/license/kunitsucom/ccc)](LICENSE)
4+
[![pkg](https://pkg.go.dev/badge/github.com/kunitsucom/ccc)](https://pkg.go.dev/github.com/kunitsucom/ccc)
5+
[![goreportcard](https://goreportcard.com/badge/github.com/kunitsucom/ccc)](https://goreportcard.com/report/github.com/kunitsucom/ccc)
6+
[![workflow](https://github.com/kunitsucom/ccc/workflows/CI/badge.svg)](https://github.com/kunitsucom/ccc/tree/main)
7+
[![codecov](https://codecov.io/gh/kunitsucom/ccc/branch/main/graph/badge.svg?token=4UML9FB7BX)](https://codecov.io/gh/kunitsucom/ccc)
8+
[![sourcegraph](https://sourcegraph.com/github.com/kunitsucom/ccc/-/badge.svg)](https://sourcegraph.com/github.com/kunitsucom/ccc)
99

10-
[ccc - Cloud Cost Checker](https://github.com/kunitsuinc/ccc) collects, calculates, graphs and notifies IaaS costs.
10+
[ccc - Cloud Cost Checker](https://github.com/kunitsucom/ccc) collects, calculates, graphs and notifies IaaS costs.
1111

1212
## Project Goal
1313

@@ -37,16 +37,18 @@
3737

3838
#### 1-2. Download ccc for your execution environment
3939

40-
- [Releases · kunitsuinc/ccc](https://github.com/kunitsuinc/ccc/releases)
40+
- [Releases · kunitsucom/ccc](https://github.com/kunitsucom/ccc/releases)
4141

4242
Download ccc for your execution environment as follows:
4343

4444
```bash
45+
VERSION=v0.0.6
46+
4547
# download
46-
curl -fLROSs https://github.com/kunitsuinc/ccc/releases/download/v0.0.5/ccc_v0.0.5_darwin_arm64.zip
48+
curl -fLROSs https://github.com/kunitsucom/ccc/releases/download/${VERSION}/ccc_${VERSION}_darwin_arm64.zip
4749

4850
# unzip
49-
unzip -j ccc_v0.0.5_darwin_arm64.zip '*/ccc'
51+
unzip -j ccc_${VERSION}_darwin_arm64.zip '*/ccc'
5052
```
5153

5254
#### 1-3. Run ccc
@@ -84,7 +86,7 @@ It will be posted as follows:
8486
## If you want to post cost graphs to Slack on a regular basis
8587

8688
I highly recommend this GitHub Actions: [ccc-actions - GitHub Actions for Cloud Cost Checker
87-
](https://github.com/kunitsuinc/ccc-actions)
89+
](https://github.com/kunitsucom/ccc-actions)
8890

8991
## TODO
9092

cmd/ccc/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/kunitsuinc/ccc/pkg/config"
9-
"github.com/kunitsuinc/ccc/pkg/entrypoint"
10-
"github.com/kunitsuinc/ccc/pkg/log"
11-
"github.com/kunitsuinc/util.go/must"
8+
"github.com/kunitsucom/ccc/pkg/config"
9+
"github.com/kunitsucom/ccc/pkg/entrypoint"
10+
"github.com/kunitsucom/ccc/pkg/log"
11+
"github.com/kunitsucom/util.go/must"
1212
)
1313

1414
func main() {

0 commit comments

Comments
 (0)