Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding copyright header #19555

Merged
merged 2 commits into from Mar 15, 2023
Merged

adding copyright header #19555

merged 2 commits into from Mar 15, 2023

Conversation

hghaf099
Copy link
Contributor

@hghaf099 hghaf099 commented Mar 15, 2023

This is to add the copyright header to Vault in the main branch and addresses this ticket
The copyright header is:

// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

As @ncabatoff suggested we can verify this by the following command.

git diff main...adding-copyright-header |grep -v '^---' | grep -v '^+++' |grep -v 'Copyright (c) HashiCorp, Inc.' |grep -v 'SPDX-License-Identifier: MPL-2.0' |grep -e '^[+-]' |sort -u

Running the above command results in the following diff:

+
+       $(SED) -i -e 's/Id/ID/' -e 's/SPDX-License-IDentifier/SPDX-License-Identifier/' vault/request_forwarding_service.pb.go
+       $(SED) -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' -e 's/SPDX-License-IDentifier/SPDX-License-Identifier/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go sdk/plugin/pb/backend.pb.go sdk/logical/identity.pb.go vault/activity/activity_log.pb.go
+    "builtin/credential/aws/pkcs7/**",
+ */
+-->
+/**
+<!--
-       $(SED) -i -e 's/Id/ID/' vault/request_forwarding_service.pb.go
-       $(SED) -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go sdk/plugin/pb/backend.pb.go sdk/logical/identity.pb.go vault/activity/activity_log.pb.go
-    "builtin/credentials/aws/pkcs7/**",

The SED lines are the changes made to the Makefile for the proto target as there are replacements for "Id" into "ID". And, that also changes the copyright header. So, I have added another piece to the SED commands to revert the changes to the headers in those files.
Additional piece of change in the above diff is for "builtin/credential/aws/pkcs7/**". The change is in .copywrite.hcl file, and it was made because the original path was simply wrong as in there was no "builtin/credentials/aws/pkcs7/**".

@hghaf099 hghaf099 requested a review from a team March 15, 2023 14:49
@hghaf099 hghaf099 requested review from a team and austingebauer as code owners March 15, 2023 14:49
@hghaf099 hghaf099 requested review from a team, marianoasselborn and claire-labry and removed request for a team March 15, 2023 14:49
@hghaf099 hghaf099 requested review from a team and ncabatoff March 15, 2023 15:02
@hghaf099 hghaf099 requested a review from dlaguerta March 15, 2023 15:05
@hghaf099 hghaf099 merged commit e55c18e into main Mar 15, 2023
54 of 63 checks passed
raymonstah pushed a commit that referenced this pull request Mar 17, 2023
* adding copyright header

* fix fmt and a test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants