Skip to content

Commit

Permalink
Use Base64 encoded certificates in test data to make pre-commit check…
Browse files Browse the repository at this point in the history
… happy (#584)
  • Loading branch information
uvegla authored Jan 7, 2025
1 parent 8908c44 commit c309ccf
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 99 deletions.
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ repos:
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
- id: detect-private-key
exclude: ^testdata/certs/old/tls.key$|^testdata/certs/new/tls.key$
- id: end-of-file-fixer
- id: mixed-line-ending
- id: trailing-whitespace
Expand Down
16 changes: 8 additions & 8 deletions main_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"io"
"encoding/base64"
"net/http"
"net/http/httptest"
"os"
Expand Down Expand Up @@ -54,7 +54,7 @@ func Test_healthCheck(t *testing.T) {
}

func copyCertificate(path string) error {
r, err := os.Open(path + "/tls.crt")
r, err := os.ReadFile(path + "/tls-b64.crt")
if err != nil {
return err
}
Expand All @@ -64,12 +64,12 @@ func copyCertificate(path string) error {
return err
}

_, err = io.Copy(w, r)
crt, err := base64.StdEncoding.DecodeString(string(r))
if err != nil {
return err
}

err = r.Close()
_, err = w.Write(crt)
if err != nil {
return err
}
Expand All @@ -79,22 +79,22 @@ func copyCertificate(path string) error {
return err
}

r, err = os.Open(path + "/tls.key")
r, err = os.ReadFile(path + "/tls-b64.key")
if err != nil {
return err
}

w, err = os.Create("testdata/certs/current/tls.key")
key, err := base64.StdEncoding.DecodeString(string(r))
if err != nil {
return err
}

_, err = io.Copy(w, r)
w, err = os.Create("testdata/certs/current/tls.key")
if err != nil {
return err
}

err = r.Close()
_, err = w.Write(key)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions testdata/certs/new/tls-b64.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN4ekNDQWErZ0F3SUJBZ0lVR1k1anA3MlpEZ3Zmby9HRjhVZFovcUhCT2NZd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0FEQWVGdzB5TkRFd01Ea3hOREl5TVRGYUZ3MHpOREV3TURjeE5ESXlNVEZhTUFBd2dnRWlNQTBHQ1NxRwpTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEY0EyN1J4elFFN0Z3ckg4QkFXYjd5K1NLVU1EN1lDczd4CnBUWVpPUEdhZ0EwV1RzSnlDL29Tb1RtZUUzOGhKRFFJZng0Q3hPcklocjVCdm9yZFJkem1LNVFwZDhDa1FIMTEKWHZDa3ZnSU81bDIwbHo5S09obHYwV2ZFNTlab0J5WTUyTTVBNHVSSEZsRGY0RE5MRDdpb2F1VU5weDcvRWVxYgpkQlFlZDFSWDVTV1VwOU9RSGFqSXVzVCtpV0ZoZnl6T2pRbHJvcWFPN1diNm10bDdWVzdyWkdESDFGYUdwQi92CmZGMm02dVpKRGNpQ1VCOUxjd0FhUlI0QldueUJLOVBWYVlVbnFEMk1uWFpQcmVzYWkxYnMvcFJ3bk5YNTJKMFQKSWJYbzNrL01vbGN1eVc3aFlIUnRERXFQQWltR2liSEtySVBJTW8rTERaZzNQT3dnaEpSTkFnTUJBQUdqT1RBMwpNQXNHQTFVZER3UUVBd0lGNERBSkJnTlZIUk1FQWpBQU1CMEdBMVVkRGdRV0JCVElJQmZSVDlRS0xBTjZHbDZDCmpJWVJwbDNMVFRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQXRFSkZkRWhTREVObVhVdFMrVEZPNUV3c3prK1EKOFVsZldMdlhJRkg4T2VFTHVKOURjVXFWKzlrSkRObzFNSnp0ZXMzc0FmZzQ5elZISUh5Ry9jWHFuYmZXdUJXTQpDV2RyaUwzMmJJREJYRzI2KzQ1aElHWStqZ283a0pOaHdZelFteTA2Q1AxK3UwZDRJOCtBZGtsZHpxQUIvelpaCmVTUGVhYUovZE40VE1SL3hQYjQ5QVNDYlJBNWsvZU02TERmWG9VVHZ1TzBnRWRVWTQ0dEVHNmw2SlFCTEc0YWMKTW9YdzlhSWpwSFBHa2tkVjN0WWdEN29tUXlBd2tzR3QzTW1aUGRVaTRqcnpFcjZ1dENvMkNEYkludndDbDhQTgpYY2R6eGdnR1FPdTRZZGZYS2NpSStNRDlycExxb0VNY0s3aFRKZUZ1OG4vRDJET21kaDRNM213MXJnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
1 change: 1 addition & 0 deletions testdata/certs/new/tls-b64.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2d0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktrd2dnU2xBZ0VBQW9JQkFRRGNBMjdSeHpRRTdGd3IKSDhCQVdiN3krU0tVTUQ3WUNzN3hwVFlaT1BHYWdBMFdUc0p5Qy9vU29UbWVFMzhoSkRRSWZ4NEN4T3JJaHI1Qgp2b3JkUmR6bUs1UXBkOENrUUgxMVh2Q2t2Z0lPNWwyMGx6OUtPaGx2MFdmRTU5Wm9CeVk1Mk01QTR1UkhGbERmCjRETkxEN2lvYXVVTnB4Ny9FZXFiZEJRZWQxUlg1U1dVcDlPUUhhakl1c1QraVdGaGZ5ek9qUWxyb3FhTzdXYjYKbXRsN1ZXN3JaR0RIMUZhR3BCL3ZmRjJtNnVaSkRjaUNVQjlMY3dBYVJSNEJXbnlCSzlQVmFZVW5xRDJNblhaUApyZXNhaTFicy9wUnduTlg1MkowVEliWG8zay9Nb2xjdXlXN2hZSFJ0REVxUEFpbUdpYkhLcklQSU1vK0xEWmczClBPd2doSlJOQWdNQkFBRUNnZ0VBSm9GN1RiKzlmUGNaRW5zV0hLMFlYRkg2R1ZGd1RrTm1BS2pYbFFhQVVuZ0MKMGxxcWNXZGpOd3Q4bUF2MWZnbG1DZTZsZy9xTzFOV3dTclZjZkdtVHhienV5MnNvRGhjelhlMWwxSTlrc05MawpwNHlwQ1FhdUdRSGZWWGoxNzNNQTM3THdOaTcvb09sbzhpVzlGSEFGODRQeDNyZlhGdkU5ekVNK21pNXNWbzF6CkphdC9BZTJTL1AzbXc3R1FaLzhtWGxvL3dEaC9XaUVSWnRoaUQzMzJRWEt6MzdmQ1FaT2g2RWlUVXhYQzJYM2IKQW1pRms4WkxTc0c4SkFFNnBUOXg2T2pBV2t5dG0yQXZQdFVZUkI4ZGozNjAyWklPMUVjNWU0SEo3cnIzbGhqRAppVERMcloveXFoV1Zpby9hMTlhRWp5eU5sUDNLdzMybVB4QWNPK0ZyQ1FLQmdRRDMzUmZ1eXIyaTNSVFJ5dGFQClR3Rno0T3NmVGc5ekdjQkNpWXYvT1l6QSs1MTR0NlAvREF2d3F6ZVlnNHRuTjVubWlHWXN5NEVGQzVFaDI2UFQKcUU5bmhRWFZQNjZ1enY2NU5JdUhYSWRYVmUxWDJSRk9aZ0Ivc3U0Y2J6WENPWWFnOTVNT1lBTW1ybk9WcDhoegpuZENVemp3dXZrcTNiQk12Y0RhbmVzKytMd0tCZ1FEalBFMDcxQXhPV3d1WXVyakJWN3dlVUF1LzFTcVVJVXEwCkMydnlsbXJiQ013d1hpS2piRnQ4Kzg5aFlTREgrcUIzRDlkM3BoMGZQRXpsTlllTlFBU1NWbjExdUJtRlJyVm0KcWV5ZTU4UWcxUGw3UWY5OW5aNW5KWGxXUFJCMnNqYVhtRXNHYW9TZm5EZzFEbUw0TkNHYU0vMFBQQmZLaGJuZQpTendlRklHU1F3S0JnUURJU1JyV3RYTHBVSlpMTkFtT2didmR4Q2lhQWp6UHVFWTRQZWNuVkh5ZFVIU2RvRjdmCmIvK1IrUGlTdi9EOGRkeGhnV1IyMi9ha2VnVkxnNnp0RWpzZm5ranBXVzB4Q2tpZ3BZbjkxbEh5eTVkZS9pTlMKNDIrUndLZFJ5TGQ2KzNzRFJTcktXZUVSOTdPa2daQ2poQ21RcE5uU3Q2ZXVjYUZMR3ZTKy9xa3h0d0tCZ1FDMApkSFh0TmpkVG5tLzJLUXFCMkRlM1p0Lzl4cjRhaHRtNVkzeWxXSmloT3pwVWl0MDlKTmIreVVabVVlampod0FaCnJVWHlhY09rdzVGWlVRcEZ2UG9rY0hVUG9GVDhCeXdWeklueG82S1laQ2wvbmVqVWkvQjRmMFQ5bkY3UHREVXcKYkN2Z2U0UzQ4Q21lMEw3OTF3QjhZaDdzRTAvZGNCY3NGbGsybGhoVDJ3S0JnUURsZW50MDlJWGFBdm8xenk1Two3ZThEbDFmOC8vWkgwekhpcyt2dDgrNzJEbkhTelRFdlFtZ2ZjNEZVWW1ybnpKdG5PQ3RFSVl6SXk1TXNybDhkCnF5Wms1eDRqQ3ZaS2JyaU9WR1QvZE90WG54N0cvUXJCejE4c1NEVDNaMUFVb2kzb29oZnZWaDliTHowbWlHZm0KaCtPaElUMmtDc2FjalRuQ1NJZGNXaGVtRFE9PQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==
17 changes: 0 additions & 17 deletions testdata/certs/new/tls.crt

This file was deleted.

28 changes: 0 additions & 28 deletions testdata/certs/new/tls.key

This file was deleted.

1 change: 1 addition & 0 deletions testdata/certs/old/tls-b64.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN4akNDQWE2Z0F3SUJBZ0lUVFZ6ZUgxR0ZjTHVmMmVocWU2MUR5eWtTNGpBTkJna3Foa2lHOXcwQkFRc0YKQURBQU1CNFhEVEkwTVRBd09URXpOVEl3TWxvWERUTTBNVEF3TnpFek5USXdNbG93QURDQ0FTSXdEUVlKS29aSQpodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU5majN3MHRXMlVjZnNOK2V3QzdqME9sUDZ2bHFNcFRQdU5VCmczeU1HTm1waEJLNkMvRDVWYTNSQVhXeHowN01pNHVLM3hvdldBRzl6T3B0Z2lTREhrWFVaWnJpQW5VMVJGanEKR2xPWGYvb1B5NlorSGZRNXRTU1Y3T2g0dVA4Z3diUTg0Y09xT0VQZnU2ekh3RCtONDlocXMzdkk3b3VVcDJjZwpNQ1VvaUYydXZHaVpXN2JTYk5UcXMzVUFEaUNVSlBPVkY5RDRvWDBGY0M2MTdnMHFvQUZlb251aUVDSjVOQ04rClpNSThIT01JUm1WVTkvSzNSM0JhM1o2Y3JaNEZwWGJQeEx2cU9qV2NSeVZtQXlYb09LK25OUWpnUFQyV0RBYjIKcmp2Mjhzb3pvQjBiRnlIU2FhbzhQN2o4REZKdkZ5aUc1dWdIdk9HdktvVTRiTXhDMDkwQ0F3RUFBYU01TURjdwpDd1lEVlIwUEJBUURBZ1hnTUFrR0ExVWRFd1FDTUFBd0hRWURWUjBPQkJZRUZLeHVSd0g2dzR3aThqVGlEOWxDCkFNbE5tbTRLTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFEVU53VjdTUXliWUgyREhIMGZ1M1FvNDRGWE0wSUoKWWhBQVRuQjY5WGxCckdQZ0xPaVEwZVh1Nk9ucnhPQlZ1OGdtWDY5ZzZtalA5ODJQMXpQbVhDVktSdHpUbjFqSApsd0dGTDV0bVMvYUNqdG1NODBhZnMwMWt1bmpFRTFrMTFwdEZUdGpTODJ4UkhQOUplT3Vwd3FSc3FhU2tQSllKCnRIVS9yYjBlRjZPT3l2M0RlSy9KY01taEc5RnhlUVZ5b1JDbFA3emJLak1jQjNVaTZDYWhWaC9PNkg0WnhCT0EKMUc1c09lR1dLK29INVVxTi9CMG02L3A2RXFhMkhlVVJ2TUlJdjk5WEZwSkk4SVQyRjNFRE5kWE1MVGhGbzBTQQp6NjdzdVRreUlxZ0JPdnRTQ3VlYVQrejY2MmdLdmhaWjd4b3h3T3ZiYzA1T1M1dW4zbEgxeVR3SwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
1 change: 1 addition & 0 deletions testdata/certs/old/tls-b64.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRRFg0OThOTFZ0bEhIN0QKZm5zQXU0OURwVCtyNWFqS1V6N2pWSU44akJqWnFZUVN1Z3Z3K1ZXdDBRRjFzYzlPekl1TGl0OGFMMWdCdmN6cQpiWUlrZ3g1RjFHV2E0Z0oxTlVSWTZocFRsMy82RDh1bWZoMzBPYlVrbGV6b2VMai9JTUcwUE9IRHFqaEQzN3VzCng4QS9qZVBZYXJON3lPNkxsS2RuSURBbEtJaGRycnhvbVZ1MjBtelU2ck4xQUE0Z2xDVHpsUmZRK0tGOUJYQXUKdGU0TktxQUJYcUo3b2hBaWVUUWpmbVRDUEJ6akNFWmxWUGZ5dDBkd1d0MmVuSzJlQmFWMno4Uzc2am8xbkVjbApaZ01sNkRpdnB6VUk0RDA5bGd3RzlxNDc5dkxLTTZBZEd4Y2gwbW1xUEQrNC9BeFNieGNvaHVib0I3emhyeXFGCk9Hek1RdFBkQWdNQkFBRUNnZ0VBSlBka0EwL2JxUy9NcGVGVG92KzZxNERSYXZmdlk3dUcxbXFyZkFsS0hRVVoKZEJKdXhvT1BEK3pzbE5CT09NWXQ4OFlpNXdzcHhOeVF5S2haSXpMZlhXSWR4cnhCNHZ0c3VWUFdqNjh1anUwaQorQjU2dHcybGpuN3NlcTduTUdwVnVLeS9GSitpTkQ4TVZleTdKcmEvUjVpWHBJKzJodWg4bEp3dW1rSTdQVjBFCmF0N28rd2xjeGYyZGFPY21KT1JEMmROcjArUEdNOGZMVnFqT3VaNC85T0N0SHNXclloSTBYMVNvUGJWampUKzAKTVFpbmZNRWR0MC9ZQjFHZUs4V2c4RUVVYXJLQ0Y0bVEwaUF2cHhDN1JCQlgrS05mZ2NYRTljYzFPWVBZMGI3ZQpEc2JyT0p6Ymw4aERuSzFMNkRielEvbWtwSjdsOEZQV21jQnVFdC94MlFLQmdRRHRmemo1aytHa28vZVIvOGdPCjhGaXpzODBQVXhBRDdZOXdtd1dMK2UrV3lhejBLUVpSREFuTXo2ZWFUMHZwNzBwN1NFc2tQZVBKdDN5dWFBcHQKS09SNUFHQnlIZ042Zlh0TElSc3NQd1pvZDM4cS9NVEJqOVZIVHJ5d3Y4eDRGblN6cjc4NmJ0V2tVQlhtWXdQdgp6eG9MNnpzUGluakZoN09rV1VhSk1LSkFpUUtCZ1FEb3RiV1h1eFBIL3JUOXBDMTVMR2JXbVV4b0tXdEJ2a0FKCm5aa01WeWdLNkpON2hRa0hIcERoL0ZLVlE0OEo5Y0tidUZRenVrbVdrU1RJUzRiNkRjMnJEY052ZXVuMEJia2UKN1cyU1JQaDRhV1U2YXFpaVh5YVlEUTdWZTdzWmNYUC96eUVuUHIrYTRJeVpPWHBnWVliZUd4NTJ2Y21zZUFtdQpYYWRDeUNiYnRRS0JnRXBNemU5T3MzNEZpaE5UK1N1clI2VFlzR09GOGZHNHBYSnVIVHNnY3pNeVh2aDN5VEViCjJna0lRZ0FGcE5OSCtINC9MTHJtM2RlaW50QVZYb1d1RUdSR21PVzZ2QTNiS2ZKa0poTWVtSXVnTHRtdEFJVXAKMFdpZ21tbVZaNHQrUXY1Z0VpeGV0bG5VY0RXR2JwbmNxZUptc2pCM2VyY1pjRHNQYndER2hVdzVBb0dBRnBxLwovdk1mSXNndEVJNUlGSU1wb2lMVjl6QSt5TzRRRGw4T3BOSTZnNFMvL3JtWGZPZU5MMFp4UnlwKzFIclk0b052Ck9tOFlBdFlxZW9KTHBESi9EZVNTWFZ2VktlejhaSEt2dUF1WER5czl1QVR3U0lWeG5FZDRiMmhMYmxkRTYwNVYKYkJoK1NDOFR1VGFLR3A2ZW1TaU5OditNZllKVGZtcCtldEF5WmhrQ2dZRUE0RFRJeXppaHVVOEdEOTRFTDJEcAo4K29rcEJPRW9ZdnphdnNqRngvUEJvZmxmWGZ5QmR0QTFZbmZNcHpuSldpSE43eG93cUNsMVBmaTU5bEtJcElOCmtDZDdtRjlYNzc0U0VFWEJVR0kzSFFJbllxZk5VRnM4TEQyNC9EZXJ0MStYWEFEYkJ2THFKdnJVbVZURjBwalMKYlBKcWppQ1ZFSlRKdzVNYXl6UWRGaXM9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
17 changes: 0 additions & 17 deletions testdata/certs/old/tls.crt

This file was deleted.

28 changes: 0 additions & 28 deletions testdata/certs/old/tls.key

This file was deleted.

0 comments on commit c309ccf

Please sign in to comment.