diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bcbfa3b..9920260 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,3 +1,18 @@ +#!/bin/bash +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions name: ci @@ -29,18 +44,18 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common ca-certificates gnupg-agent curl build-essential make python3-pip golang-goprotobuf-dev protobuf-compiler parallel - # Ref: https://github.com/actions/setup-go - - name: Install Go - uses: actions/setup-go@v5 - with: - go-version: ">= 1.23" - # Ref: https://github.com/actions/checkout - name: Checkout Source uses: actions/checkout@v4 with: fetch-depth: 0 + # Ref: https://github.com/actions/setup-go + - name: Install Go + uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - name: Build run: | make build diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 120000 index 0000000..766969a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ +CHANGELOG/README.md \ No newline at end of file diff --git a/CHANGELOG/CHANGELOG-1.x.md b/CHANGELOG/CHANGELOG-1.x.md new file mode 100644 index 0000000..df25d33 --- /dev/null +++ b/CHANGELOG/CHANGELOG-1.x.md @@ -0,0 +1,44 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +Date format: `YYYY-MM-DD` + +--- +## [Unreleased] + +### Added +### Changed +### Deprecated +### Removed +### Fixed +### Security + +--- +## [1.21.0] - 2024-11-17 + +### Added +- **FEATURE:** Added a [CHANGELOG](CHANGELOG.md) to track all notable changes to the project. + +### Changed +### Deprecated +### Removed +### Fixed +### Security + +[Unreleased]: https://github.com/sixafter/nanoid/compare/v1.21.0..HEAD +[1.21.0]: https://github.com/sixafter/nanoid/compare/v1.0.1...v1.21.0 + +[MUST]: https://datatracker.ietf.org/doc/html/rfc2119 +[MUST NOT]: https://datatracker.ietf.org/doc/html/rfc2119 +[SHOULD]: https://datatracker.ietf.org/doc/html/rfc2119 +[SHOULD NOT]: https://datatracker.ietf.org/doc/html/rfc2119 +[MAY]: https://datatracker.ietf.org/doc/html/rfc2119 +[SHALL]: https://datatracker.ietf.org/doc/html/rfc2119 +[SHALL NOT]: https://datatracker.ietf.org/doc/html/rfc2119 +[REQUIRED]: https://datatracker.ietf.org/doc/html/rfc2119 +[RECOMMENDED]: https://datatracker.ietf.org/doc/html/rfc2119 +[NOT RECOMMENDED]: https://datatracker.ietf.org/doc/html/rfc2119 diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md new file mode 100644 index 0000000..e9fe897 --- /dev/null +++ b/CHANGELOG/README.md @@ -0,0 +1,3 @@ +# CHANGELOGs + +- [CHANGELOG-1.x](./CHANGELOG-1.x.md) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..20bcc4f --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,133 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official email address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +[INSERT CONTACT METHOD]. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..f5d08cf --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,166 @@ +# Contributing + +Thank you for your interest in contributing to **Types**! Your contributions help make this project better for everyone. This guide outlines the process for contributing to the project, including reporting issues, submitting pull requests, and adhering to the project's code of conduct. + +## 📜 Table of Contents + +- [Code of Conduct](#code-of-conduct) +- [How to Contribute](#how-to-contribute) + - [Reporting Bugs](#reporting-bugs) + - [Requesting Features](#requesting-features) + - [Submitting Changes](#submitting-changes) +- [Coding Guidelines](#coding-guidelines) + - [Style Guidelines](#style-guidelines) +- [Security Considerations](#-security-considerations) +- [Pull Request Process](#pull-request-process) +--- + +## 🛡️ Code of Conduct + +This project adheres to the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [osint@sixafter.com](mailto:osint@sixafter.com). + +--- + +## Versioning + +This software adheres to the [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html) standard for version numbering as quoted here: + +Given a version number MAJOR.MINOR.PATCH, increment the: + +1. MAJOR version when you make incompatible API changes +2. MINOR version when you add functionality in a backward compatible manner +3. PATCH version when you make backward compatible bug fixes + +Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format. + +--- + +## 🤝 How to Contribute + +There are several ways you can contribute to NanoID for Go: + +### 🐛 Reporting Bugs + +If you encounter a bug or unexpected behavior: + +1. **Search Existing Issues**: Check if the issue has already been reported [here](https://github.com/sixafter/nanoid/issues). +2. **Open a New Issue**: If not, open a new issue describing the bug in detail. + - **Provide a Clear Title**: Summarize the problem. + - **Describe the Behavior**: Explain what you expected to happen versus what actually happened. + - **Steps to Reproduce**: Include code snippets or commands that can help reproduce the issue. + - **Environment Details**: Mention your Go version, operating system, and any other relevant information. + +### 🌟 Requesting Features + +To suggest new features or improvements: + +1. **Search Existing Features**: Ensure your idea hasn't been discussed [here](https://github.com/sixafter/nanoid/issues?q=is%3Aissue+is%3Aopen+label%3Afeature). +2. **Open a New Feature Request**: Provide a detailed description of the feature. + - **Describe the Feature**: Explain what the feature is and why it's needed. + - **Use Cases**: Provide examples of how the feature would be used. + - **Potential Implementation**: If possible, suggest how it could be implemented. + +### ✨ Submitting Changes + +Contributions in the form of bug fixes, improvements, or new features are welcome! + +#### 1. Fork the Repository + +Fork the repository to your GitHub account by clicking the **Fork** button at the top right of the repository page. + +#### 2. Clone Your Fork + +Clone the forked repository to your local machine: + +```bash +git clone https://github.com/sixafter/types.git +cd nanoid +``` + +#### 3. Create a New Branch + +Create a new branch for your changes: + +```bash +git checkout -b feature/your-feature-name +``` + +#### 4. Make Your Changes + +#### 5. Run Tests and Linters + +Ensure all tests pass and the code adheres to the style guidelines: + +```bash +make lint +make test +``` + +#### 6. Commit Your Changes + +Commit your changes with a clear and descriptive message: + +```bash +git add . +git commit -m "Add descriptive commit message" +``` + +#### 7. Push to Your Fork + +Push your changes to your forked repository: + +```bash +git push origin feature/your-feature-name +``` + +#### 8. Open a Pull Request + +Navigate to the original repository and click New Pull Request. Provide a clear description of your changes and link any related issues. + +## 🎨 Coding Guidelines + +Adhering to consistent coding standards ensures the codebase remains clean, readable, and maintainable. + +### 🖋️ Style Guidelines + +* **Formatting**: Use `make fmt` to format your code. +* **Linting**: Follow the linting rules defined in `.golangci.yaml`. Ensure that your code passes all linters before submitting. +* **Documentation**: Document public functions, types, and methods using Go's standard documentation conventions. +* **Error Handling**: Handle errors gracefully and consistently. Use the predefined error types where applicable. + +--- + +## 🔒 Security Considerations + +* **Randomness**: Ensure that all randomness sources use cryptographically secure methods (crypto/rand). +* **Data Sanitization**: Avoid exposing sensitive data through IDs or logs. + +--- + +## 🚀 Pull Request Process + +Follow these steps to create a successful pull request (PR): + +1. Ensure Your Branch is Up-to-Date + * Before opening a PR, make sure your branch is based on the latest main branch. +2. Create a Pull Request +3. Address Feedback + * **Respond Promptly**: Engage with reviewers by responding to comments and making necessary changes. + * **Update Your PR**: Push additional commits to your branch to address feedback. +4. Merge the PR + * Once approved and all checks pass, your PR will be merged by a maintainer. + +--- + +## 📝 Additional Resources + +* [Go Documentation](https://go.dev/doc/) +* [GolangCI-Lint Documentation](https://golangci-lint.run) +* [GitHub Flow](https://docs.github.com/en/get-started/using-github/github-flow) +* [Contributor Covenant Code of Conduct](https://github.com/sixafter/nanoid/blob/main/CODE_OF_CONDUCT.md) + +## 🙏 Thank You! + +We appreciate your interest in contributing to NanoID for Go! Your efforts help improve the project and support the community. If you have any questions or need assistance, feel free to reach out by opening an issue or contacting the maintainers. + +Happy coding! 🎉 \ No newline at end of file diff --git a/Makefile b/Makefile index d342e83..302bebd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index a204ebd..e87f4ae 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ represented as [Google Protocol Buffers](https://developers.google.com/protocol- ### Status [![ci](https://github.com/sixafter/types/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/sixafter/types/actions/workflows/ci.yaml) -![GitHub](https://img.shields.io/github/license/sixafter/types) +[![Go](https://img.shields.io/github/go-mod/go-version/sixafter/types)](https://img.shields.io/github/go-mod/go-version/sixafter/types) +[![Go Report Card](https://goreportcard.com/badge/github.com/sixafter/types)](https://goreportcard.com/report/github.com/sixafter/types) +[![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](LICENSE) [![GitHub issues](https://img.shields.io/github/issues/sixafter/types)](https://img.shields.io/github/issues/sixafter/types) ![GitHub last commit](https://img.shields.io/github/last-commit/sixafter/types) @@ -32,13 +34,13 @@ import ( The use of Go [vendoring](https://golang.org/ref/mod#vendoring) is [RECOMMENDED]. -### Contributing +## Contributing -This is an open source project run by volunteers, and contributions are welcome! Check out the [Issues](https://github.com/sixafter/types/issues) page to see if your idea has already been mentioned. Feel free to raise an issue or submit a pull request. +Contributions are welcome. See [CONTRIBUTING](CONTRIBUTING.md) ### License -The code is licensed under the permissive Apache v2.0 license. [Read this](https://choosealicense.com/licenses/apache-2.0/) for a summary. +This project is licensed under the [Apache 2.0 License](https://choosealicense.com/licenses/apache-2.0/). See [LICENSE](LICENSE) file. [MUST]: https://datatracker.ietf.org/doc/html/rfc2119 [MUST NOT]: https://datatracker.ietf.org/doc/html/rfc2119 diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..7525755 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,9 @@ +# Security Policy + +## Supported Versions + +Patches will be released to the latest major version. + +## Reporting a Vulnerability + +Please report (suspected) security vulnerabilities to [security@sixafter.com](mailto:security@sixafter.com). If the issue is confirmed, we will release a patch as soon as possible depending on complexity. diff --git a/compass_heading.pb.go b/compass_heading.pb.go index aef9691..246b122 100644 --- a/compass_heading.pb.go +++ b/compass_heading.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: compass_heading.proto diff --git a/compass_heading.proto b/compass_heading.proto index acec1c2..f57ad13 100644 --- a/compass_heading.proto +++ b/compass_heading.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/country.pb.go b/country.pb.go index 7aed398..1453544 100644 --- a/country.pb.go +++ b/country.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: country.proto diff --git a/country.proto b/country.proto index b107f48..f8b4c3f 100644 --- a/country.proto +++ b/country.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/country_subdivision.pb.go b/country_subdivision.pb.go index bd37e14..6df908a 100644 --- a/country_subdivision.pb.go +++ b/country_subdivision.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: country_subdivision.proto diff --git a/country_subdivision.proto b/country_subdivision.proto index a4311af..4dfae82 100644 --- a/country_subdivision.proto +++ b/country_subdivision.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/email_address.pb.go b/email_address.pb.go index 258381c..b56158d 100644 --- a/email_address.pb.go +++ b/email_address.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: email_address.proto diff --git a/email_address.proto b/email_address.proto index 4b32e81..1a93565 100644 --- a/email_address.proto +++ b/email_address.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/entity_metadata.pb.go b/entity_metadata.pb.go index b093878..5f0041a 100644 --- a/entity_metadata.pb.go +++ b/entity_metadata.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: entity_metadata.proto diff --git a/entity_metadata.proto b/entity_metadata.proto index a1c50d5..9ee7f39 100644 --- a/entity_metadata.proto +++ b/entity_metadata.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/geofence.pb.go b/geofence.pb.go index be25272..4c3582c 100644 --- a/geofence.pb.go +++ b/geofence.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: geofence.proto diff --git a/geofence.proto b/geofence.proto index 58ecf6c..c28cfdc 100644 --- a/geofence.proto +++ b/geofence.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/geographic_region.pb.go b/geographic_region.pb.go index 946d3bc..1ac83a5 100644 --- a/geographic_region.pb.go +++ b/geographic_region.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: geographic_region.proto diff --git a/geographic_region.proto b/geographic_region.proto index aaedaf9..0d09da3 100644 --- a/geographic_region.proto +++ b/geographic_region.proto @@ -1,5 +1,5 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) -// +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/geospatial_coordinate.pb.go b/geospatial_coordinate.pb.go index 51c0beb..1172582 100644 --- a/geospatial_coordinate.pb.go +++ b/geospatial_coordinate.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: geospatial_coordinate.proto diff --git a/geospatial_coordinate.proto b/geospatial_coordinate.proto index 8cc305c..a36e8d7 100644 --- a/geospatial_coordinate.proto +++ b/geospatial_coordinate.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/geospatial_elevation.pb.go b/geospatial_elevation.pb.go index d204ef3..12b1571 100644 --- a/geospatial_elevation.pb.go +++ b/geospatial_elevation.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: geospatial_elevation.proto diff --git a/geospatial_elevation.proto b/geospatial_elevation.proto index ba7725b..ca227e1 100644 --- a/geospatial_elevation.proto +++ b/geospatial_elevation.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/geospatial_location.pb.go b/geospatial_location.pb.go index f4eb677..078a42b 100644 --- a/geospatial_location.pb.go +++ b/geospatial_location.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: geospatial_location.proto diff --git a/geospatial_location.proto b/geospatial_location.proto index 4012b93..f3eb322 100644 --- a/geospatial_location.proto +++ b/geospatial_location.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/go.mod b/go.mod index 7224f75..61cefe9 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,6 @@ module github.com/sixafter/types go 1.23 -require google.golang.org/protobuf v1.35.1 +require google.golang.org/protobuf v1.35.2 require github.com/google/go-cmp v0.6.0 // indirect diff --git a/go.sum b/go.sum index 6ffa8d7..0db4393 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= diff --git a/map_point.pb.go b/map_point.pb.go index dd4cea9..6edf9ef 100644 --- a/map_point.pb.go +++ b/map_point.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: map_point.proto diff --git a/map_point.proto b/map_point.proto index f9b24b2..a69c0c2 100644 --- a/map_point.proto +++ b/map_point.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/polygon.pb.go b/polygon.pb.go index 16623ca..d274c6d 100644 --- a/polygon.pb.go +++ b/polygon.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: polygon.proto diff --git a/polygon.proto b/polygon.proto index 430c936..06e2d6a 100644 --- a/polygon.proto +++ b/polygon.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/radial_geofence.pb.go b/radial_geofence.pb.go index 929fd3c..05a01a1 100644 --- a/radial_geofence.pb.go +++ b/radial_geofence.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: radial_geofence.proto diff --git a/radial_geofence.proto b/radial_geofence.proto index abfa458..48ef934 100644 --- a/radial_geofence.proto +++ b/radial_geofence.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/scripts/go-build.sh b/scripts/go-build.sh index e0726ee..1afe8b9 100755 --- a/scripts/go-build.sh +++ b/scripts/go-build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/go-clean.sh b/scripts/go-clean.sh index 8d490e2..0b67b34 100755 --- a/scripts/go-clean.sh +++ b/scripts/go-clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/go-deps.sh b/scripts/go-deps.sh index 148120f..ee25e69 100755 --- a/scripts/go-deps.sh +++ b/scripts/go-deps.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/go-install.sh b/scripts/go-install.sh index 255957e..4055245 100755 --- a/scripts/go-install.sh +++ b/scripts/go-install.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/os-type.sh b/scripts/os-type.sh index 3892a7c..7930096 100755 --- a/scripts/os-type.sh +++ b/scripts/os-type.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 SIX AFTER, LLC (SIX AFTER) +# Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/temporal_range.pb.go b/temporal_range.pb.go index cb36471..247da2b 100644 --- a/temporal_range.pb.go +++ b/temporal_range.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: temporal_range.proto diff --git a/temporal_range.proto b/temporal_range.proto index ac0e7e6..92e5495 100644 --- a/temporal_range.proto +++ b/temporal_range.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/time_zone.pb.go b/time_zone.pb.go index aec32f4..1c903f2 100644 --- a/time_zone.pb.go +++ b/time_zone.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: time_zone.proto diff --git a/time_zone.proto b/time_zone.proto index 2bf1385..d152860 100644 --- a/time_zone.proto +++ b/time_zone.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/uri.pb.go b/uri.pb.go index b1b8d7c..5cf8f84 100644 --- a/uri.pb.go +++ b/uri.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: uri.proto diff --git a/uri.proto b/uri.proto index b898614..48e8b57 100644 --- a/uri.proto +++ b/uri.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/url.pb.go b/url.pb.go index 2686cea..02cefa0 100644 --- a/url.pb.go +++ b/url.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: url.proto diff --git a/url.proto b/url.proto index 491f08e..e042866 100644 --- a/url.proto +++ b/url.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb b/vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb index ff6a383..2c0693d 100644 Binary files a/vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb and b/vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb differ diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/desc.go b/vendor/google.golang.org/protobuf/internal/filedesc/desc.go index fa790e0..f325298 100644 --- a/vendor/google.golang.org/protobuf/internal/filedesc/desc.go +++ b/vendor/google.golang.org/protobuf/internal/filedesc/desc.go @@ -32,6 +32,7 @@ const ( EditionProto2 Edition = 998 EditionProto3 Edition = 999 Edition2023 Edition = 1000 + Edition2024 Edition = 1001 EditionUnsupported Edition = 100000 ) @@ -77,28 +78,42 @@ type ( Locations SourceLocations } + // EditionFeatures is a frequently-instantiated struct, so please take care + // to minimize padding when adding new fields to this struct (add them in + // the right place/order). EditionFeatures struct { + // StripEnumPrefix determines if the plugin generates enum value + // constants as-is, with their prefix stripped, or both variants. + StripEnumPrefix int + // IsFieldPresence is true if field_presence is EXPLICIT // https://protobuf.dev/editions/features/#field_presence IsFieldPresence bool + // IsFieldPresence is true if field_presence is LEGACY_REQUIRED // https://protobuf.dev/editions/features/#field_presence IsLegacyRequired bool + // IsOpenEnum is true if enum_type is OPEN // https://protobuf.dev/editions/features/#enum_type IsOpenEnum bool + // IsPacked is true if repeated_field_encoding is PACKED // https://protobuf.dev/editions/features/#repeated_field_encoding IsPacked bool + // IsUTF8Validated is true if utf_validation is VERIFY // https://protobuf.dev/editions/features/#utf8_validation IsUTF8Validated bool + // IsDelimitedEncoded is true if message_encoding is DELIMITED // https://protobuf.dev/editions/features/#message_encoding IsDelimitedEncoded bool + // IsJSONCompliant is true if json_format is ALLOW // https://protobuf.dev/editions/features/#json_format IsJSONCompliant bool + // GenerateLegacyUnmarshalJSON determines if the plugin generates the // UnmarshalJSON([]byte) error method for enums. GenerateLegacyUnmarshalJSON bool diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/editions.go b/vendor/google.golang.org/protobuf/internal/filedesc/editions.go index fd4d0c8..7611796 100644 --- a/vendor/google.golang.org/protobuf/internal/filedesc/editions.go +++ b/vendor/google.golang.org/protobuf/internal/filedesc/editions.go @@ -32,6 +32,10 @@ func unmarshalGoFeature(b []byte, parent EditionFeatures) EditionFeatures { v, m := protowire.ConsumeVarint(b) b = b[m:] parent.GenerateLegacyUnmarshalJSON = protowire.DecodeBool(v) + case genid.GoFeatures_StripEnumPrefix_field_number: + v, m := protowire.ConsumeVarint(b) + b = b[m:] + parent.StripEnumPrefix = int(v) default: panic(fmt.Sprintf("unkown field number %d while unmarshalling GoFeatures", num)) } diff --git a/vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go b/vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go index 7f67cbb..09792d9 100644 --- a/vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go +++ b/vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go @@ -21,13 +21,30 @@ const ( // Field names for pb.GoFeatures. const ( GoFeatures_LegacyUnmarshalJsonEnum_field_name protoreflect.Name = "legacy_unmarshal_json_enum" + GoFeatures_StripEnumPrefix_field_name protoreflect.Name = "strip_enum_prefix" GoFeatures_LegacyUnmarshalJsonEnum_field_fullname protoreflect.FullName = "pb.GoFeatures.legacy_unmarshal_json_enum" + GoFeatures_StripEnumPrefix_field_fullname protoreflect.FullName = "pb.GoFeatures.strip_enum_prefix" ) // Field numbers for pb.GoFeatures. const ( GoFeatures_LegacyUnmarshalJsonEnum_field_number protoreflect.FieldNumber = 1 + GoFeatures_StripEnumPrefix_field_number protoreflect.FieldNumber = 3 +) + +// Full and short names for pb.GoFeatures.StripEnumPrefix. +const ( + GoFeatures_StripEnumPrefix_enum_fullname = "pb.GoFeatures.StripEnumPrefix" + GoFeatures_StripEnumPrefix_enum_name = "StripEnumPrefix" +) + +// Enum values for pb.GoFeatures.StripEnumPrefix. +const ( + GoFeatures_STRIP_ENUM_PREFIX_UNSPECIFIED_enum_value = 0 + GoFeatures_STRIP_ENUM_PREFIX_KEEP_enum_value = 1 + GoFeatures_STRIP_ENUM_PREFIX_GENERATE_BOTH_enum_value = 2 + GoFeatures_STRIP_ENUM_PREFIX_STRIP_enum_value = 3 ) // Extension numbers diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go index fb8e15e..62a52a4 100644 --- a/vendor/google.golang.org/protobuf/internal/version/version.go +++ b/vendor/google.golang.org/protobuf/internal/version/version.go @@ -52,7 +52,7 @@ import ( const ( Major = 1 Minor = 35 - Patch = 1 + Patch = 2 PreRelease = "" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 1036fa3..37e56ae 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,7 +2,7 @@ ## explicit; go 1.13 # google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 ## explicit; go 1.21 -# google.golang.org/protobuf v1.35.1 +# google.golang.org/protobuf v1.35.2 ## explicit; go 1.21 google.golang.org/protobuf/encoding/prototext google.golang.org/protobuf/encoding/protowire diff --git a/version.pb.go b/version.pb.go index b88268b..460dd9d 100644 --- a/version.pb.go +++ b/version.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: version.proto diff --git a/version.proto b/version.proto index c8665d5..8cc7c25 100644 --- a/version.proto +++ b/version.proto @@ -1,4 +1,4 @@ -// Copyright 2020 SIX AFTER, LLC (SIX AFTER) +// Copyright 2020-2024 SIX AFTER, INC (SIX AFTER) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.