From 54f8cc1bb0ba4a49b8921f1097466b160c4aa89e Mon Sep 17 00:00:00 2001 From: Pier-Hugues Pellerin Date: Thu, 15 Sep 2016 18:42:46 -0400 Subject: [PATCH] QA Integration dont ship with certificates (#5928) We are removing the pre generated certificate from the repository, the certificates needed for the test will be generated before downloading filebeat. Fixes #5917 --- qa/integration/.gitignore | 1 + .../fixtures/certificates/certificate.crt | 19 ------------- .../fixtures/certificates/certificate.key | 28 ------------------- .../certificates/generate_certificate.sh | 2 -- qa/integration/services/filebeat_setup.sh | 7 +++++ 5 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 qa/integration/fixtures/certificates/certificate.crt delete mode 100644 qa/integration/fixtures/certificates/certificate.key delete mode 100755 qa/integration/fixtures/certificates/generate_certificate.sh diff --git a/qa/integration/.gitignore b/qa/integration/.gitignore index 77f3f9332..9c614afcc 100644 --- a/qa/integration/.gitignore +++ b/qa/integration/.gitignore @@ -2,3 +2,4 @@ /fixtures/how.input /services/elasticsearch /services/kafka +/fixtures/certificates diff --git a/qa/integration/fixtures/certificates/certificate.crt b/qa/integration/fixtures/certificates/certificate.crt deleted file mode 100644 index 3bdf1b6f8..000000000 --- a/qa/integration/fixtures/certificates/certificate.crt +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/TCCAeWgAwIBAgIJANC15+/gKMqlMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV -BAMMCWxvY2FsaG9zdDAgFw0xNjA5MTIxMzU5MzBaGA8yMTE2MDgxOTEzNTkzMFow -FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAza/8Zl6B7bYTQ+cMkHdX0Nu7yJxSx9Ymt9UKEM7YWoyg0EAqSjelzzLU -jeZnIWSMTdE+rbqBeG2GUA6eoT0N57KpGVPIiYGtq9r+mmmke/D3jG3q3OeKt3WE -ClvM1msjcgSQ+buF2Ew24yNbtTFPuSnbjTgTcJBGxVnQRD6PKH3654q+ydp2scp/ -USZTAZL7p5JQbz6fNXwD67Uw5AZmHnu5djSHL6fdw2iw6UIXnaBLmxT8j/kX3WMj -1FxsTs38vJIYX3IDR/XJduk8+/9ru0t8fe6nckpVMzXFhokFk2dVNJVkii+lZqGf -AOsi7fePuFhj3PP+ms601q2CaCioDwIDAQABo1AwTjAdBgNVHQ4EFgQUnqDfyu95 -7s73TyM0lwCIkGG80MkwHwYDVR0jBBgwFoAUnqDfyu957s73TyM0lwCIkGG80Mkw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEACmrmIePvYzB9lEM7laFt -XDvOrH8mUCqGIF2S653GFIJULSmG5HdxiHyCzT8KL8XC0AJsUEQsMjV1wgW0Ttg/ -OsT+69Tf1TCuPpYyz8C+fBEVZnjgKtfbVlc8cB1M/5y08v/eyn+Od30D44dYdgVC -IgIX8xNtcEb0QcRiO3dLBE8aoRMvdOK8AnQDSrHjbyLx/wFyTsgeF2P/duf7qfOc -ouYW6nQudZvb/UxiImJmYraZ8xSZUf0FuG53Z4HZHFeYJeMtgO0Myws2VeeGwmo3 -/8P40pyaaGrde+cXb1M22XdI6ehcvyJ7pvft3wvNt269URKZSnW5GN6+pSP3vnhl -XA== ------END CERTIFICATE----- diff --git a/qa/integration/fixtures/certificates/certificate.key b/qa/integration/fixtures/certificates/certificate.key deleted file mode 100644 index c571d024b..000000000 --- a/qa/integration/fixtures/certificates/certificate.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDNr/xmXoHtthND -5wyQd1fQ27vInFLH1ia31QoQzthajKDQQCpKN6XPMtSN5mchZIxN0T6tuoF4bYZQ -Dp6hPQ3nsqkZU8iJga2r2v6aaaR78PeMberc54q3dYQKW8zWayNyBJD5u4XYTDbj -I1u1MU+5KduNOBNwkEbFWdBEPo8offrnir7J2naxyn9RJlMBkvunklBvPp81fAPr -tTDkBmYee7l2NIcvp93DaLDpQhedoEubFPyP+RfdYyPUXGxOzfy8khhfcgNH9cl2 -6Tz7/2u7S3x97qdySlUzNcWGiQWTZ1U0lWSKL6VmoZ8A6yLt94+4WGPc8/6azrTW -rYJoKKgPAgMBAAECggEBAJDiqlQhtjwPyTpHgl4w8ra4UWpaUyVZACT1+AUm7te5 -v31x9VgaIr30/CyIY5TuErat8gzGF3UREU9LPQouy6CuBNdGYTgbFI690CJM0ARO -FNHii1HX96qLKNtzFrLi/TDPbp+7K+jUpsUQnwTfG10+0tyC546e0nspbL7loknO -TsDF8JRtJAoP3Q018xeAVbqnzwMCRT8DR3Qj4Q91xPayK8QCZ/IpO9+79YNCkwez -AFxZPrhu0pgushgXW2aHFNaGWH3aw15ITcxjiZKfzjAvhHadNm4k5EznC0I3fvjf -CNb0YTOx5WiOpeaa2WTmM7cPqqKYR30ZKwlhSaoZFYECgYEA/9p8mSMS/6PzxgML -kIBRpBW9ba6NQDQTIZNBT9rcGSWHE26XUs+LGEhzhPOAFloRoxyxt35Z/WyuPzpW -wleHDCBDxzGKm2DX4dMnETMK1hrbApKoHIw2VGKTCt+4N9wGD/JB/5BeJIFWETO5 -J7hgknUsRRQbobn8bnEnpPU6Ox8CgYEAzc4k1N/dk+URtcte4N0c+rM6lHrQKHQQ -f40SUR/Atoh0Vd/2k0QXGpBz6Vo3+icymnp5kVINEFS0v0xxwjM+Ln0lIYgfE0uw -29XLDhgA72sr4vXNd/WFOkctw37DIgyoZeZPFx4L1eH3sXDTfKQ2bbeQSKa2oosm -1ModklKY5RECgYAGiwPctrTprLuzOKi3DVEJLTUm9OvP1IUYurdU33f5fKgzqwRb -rcsU1+V8ZO3FpJAG59jzpFuQy5K5Mzi8x5hAiyKwmWe+CX/72naJThDc4Nrw+ecq -s7s/9TVldcs0QoA1MDDX5E1ECbq1vejiRyjRFgYHzjfWrvbxrBsjcNIIaQKBgQCG -/RF3dya03OkS3sPqpd1eKrTfsvZZslcn8nXzM+qJT1NPCEmJKn4k9F6yznQs5gzw -+ihGwxTCg2zSlOeAw2+jun3iUpBfbaQhbUd0hRYH87mjcipE5otuQEWqFrkS2k6S -F9AEj7afoUl/30s4U9VHfcFrhb4BO1hK9g8TbI3QoQKBgQD5rMVNynisRRVaM8Uh -dp0pf4NlDvAnL2xZAAFhZgNMCkR6luZzl9f4NPpLQYYg48ftbzDkYf/CGSA2ROCo -l34MFl51A2tX9dpNDGgEq0kunEFgfiOL0nC+oWoiKqexQpEmyep4i48Bt507MOld -abV3TDYKy6RlLfMTi14qZyYQvQ== ------END PRIVATE KEY----- diff --git a/qa/integration/fixtures/certificates/generate_certificate.sh b/qa/integration/fixtures/certificates/generate_certificate.sh deleted file mode 100755 index 7de301b26..000000000 --- a/qa/integration/fixtures/certificates/generate_certificate.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -openssl req -subj '/CN=localhost/' -x509 -days $((100 * 365)) -batch -nodes -newkey rsa:2048 -keyout certificate.key -out certificate.crt diff --git a/qa/integration/services/filebeat_setup.sh b/qa/integration/services/filebeat_setup.sh index 63649ae2d..f59defc19 100755 --- a/qa/integration/services/filebeat_setup.sh +++ b/qa/integration/services/filebeat_setup.sh @@ -20,6 +20,13 @@ setup_fb() { rm $current_dir/filebeat.tar.gz } +generate_certificate() { + target_directory=$current_dir/../fixtures/certificates + mkdir -p $target_directory + openssl req -subj '/CN=localhost/' -x509 -days $((100 * 365)) -batch -nodes -newkey rsa:2048 -keyout $target_directory/certificate.key -out $target_directory/certificate.crt +} + if [ ! -d $current_dir/filebeat ]; then + generate_certificate setup_fb $version fi