From 0c834f5196ab8be2f3a7fce23a2a3b0f1348c312 Mon Sep 17 00:00:00 2001 From: Oleg Makarov Date: Fri, 25 Mar 2022 12:39:14 +0200 Subject: [PATCH 1/6] Outedated certificate has been updated --- pytest_hoverfly/cert.pem | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pytest_hoverfly/cert.pem b/pytest_hoverfly/cert.pem index 821b0a6..fa8d759 100644 --- a/pytest_hoverfly/cert.pem +++ b/pytest_hoverfly/cert.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDbTCCAlWgAwIBAgIVAPAvY6MQi4KmJYmPDmnE29y6njABMA0GCSqGSIb3DQEB -CwUAMDYxGzAZBgNVBAoTEkhvdmVyZmx5IEF1dGhvcml0eTEXMBUGA1UEAxMOaG92 -ZXJmbHkucHJveHkwHhcNMTIwMzI1MTM0NjI3WhcNMjIwMzIzMTM0NjI3WjA2MRsw -GQYDVQQKExJIb3ZlcmZseSBBdXRob3JpdHkxFzAVBgNVBAMTDmhvdmVyZmx5LnBy -b3h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsw2DShgDHkAugLb2 -efVq5XYPIiiJa1Dj+DPxQEuQDtQYAJPgGm7aCm7YLke0Gm6p2ZJBtLmEEwhwRw50 -f6oeWdd21G2RvnzWLOM8QLehUDtQUxO1pMO4prrP3WmTm/UQr0n50BCC/W/omJIZ -tdmTN5Z1kHaiYcLeOiHVzzAoVlj45vBS2Tm7guAxWMNAnvzGAif0F0LsTCLIzQBg -eZ6CQeOe0neS1pCGr4NrxuX6pDu/T/YnS+x6P+g0jUOnlwtQsGPjh1Vw0hhZJe6Z -/YdnZrIufRaAEufbq8dk/ELZVT4Mi6Gp5uy0gycnWhf1mPhsKpbEOhv1r8tEYQrn -5u4cHwIDAQABo3IwcDAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUH -AwEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUxTebj9Kv16fuWngIO4zfjddv -7fUwGQYDVR0RBBIwEIIOaG92ZXJmbHkucHJveHkwDQYJKoZIhvcNAQELBQADggEB -AKOlihA/DIAc7soiPb8s5eLvY/YTqASgzy3S1oaqEsEFAnNPOu53ePNid6bmKDvD -hc0E+sphPpcuWyzoSp4Nz5TFl7LTtIzU49mR+/Gn3tDucGLutS0PbdFen7swKTMO -/HwXy+Bm2a9g4ewgJbfIf4MhgrdX6M4gJqMVL7q/NKeppHlQ4pBYFc+HjrF4V98V -x/mHLc65qOh7iKPBVY7lSYipnMxRu5N7Q88eaqfaVh44xsIYO83N9Pn1uE9GOUu7 -Eb2Tc6UidvXZMWAfkkrGVyrJGWE4wTAIT/Dz1AKDPuTp16SyljaOZ2YahmFXMp3C -Fj+GKkpM2WS40fUI9z40WGI= +MIIDbjCCAlagAwIBAgIUdQfaPu0RqbvS9x/4ZlBEu+sIjNMwDQYJKoZIhvcNAQEL +BQAwNjEbMBkGA1UEChMSSG92ZXJmbHkgQXV0aG9yaXR5MRcwFQYDVQQDEw5ob3Zl +cmZseS5wcm94eTAgFw05NDA0MDExMDAzMDNaGA8yMDUwMDMxODEwMDMwM1owNjEb +MBkGA1UEChMSSG92ZXJmbHkgQXV0aG9yaXR5MRcwFQYDVQQDEw5ob3ZlcmZseS5w +cm94eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3SNL9a5fB/p6YY +x50EyOTWUWwvAKvE8FW+2nWZjYR7wPGWzvc8iYAdcTPAFI5jru3DodBFjL2HHH72 +mVOj018xR8VMbQpGY3DXohldygqrYJVudYjHRIH9oDFx+Bp+CtEihK7MhyPFTKdF +ctwuO7O/tkqr7vHrOM+9PiqCtcziauZqgCbRLODeuWhKk+GQl/wbghcThFwf7GLP +dhAgsyeriA0s15PIqI9BWEOzPMvhQyUpLVPm6T29Zn38h+kG1zmu2L1yLXWcKClW +ewzEzXeL3syeYMVpsyvinFvWFPTbcpAv0QWA1Bm2u6TcxBuwsgxxMacdhwappNHf +KZJ6VkUCAwEAAaNyMHAwDgYDVR0PAQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUF +BwMBMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE9wZYweUuFZecYvepPPivik +w9yEMBkGA1UdEQQSMBCCDmhvdmVyZmx5LnByb3h5MA0GCSqGSIb3DQEBCwUAA4IB +AQAWq/ZZ5+JDR3rnkIuUhDqTzxbjKK43i59ckA6/j3ZnIf31bq3fJYBh+MIZ+NZa +aMJswXUW/OA/kYSS5UTdhatN2rdZkp3buz6bXkAgIFogjBDSulwl9igjVMt5Hlkc +3+4efHA926wHQp+44NBufQ7bWS4n5XU7NQ4sjfA/Eqi0PffMMIKO1qbkpzWVfAPZ +Fg0n8FglO8MRce+KmXoCdKqaPyI+gp2qBa3ACAN0pvnp2c8cB5axrWgq9wpOGBtD +N7f0FEqVebYlkutrEqiuo1g/vLlRZRB6UGH3qMN9Kxyc2AiPkilk+KZVvInheHG+ +HJHvboudnBsk3T2pcgoqoorS -----END CERTIFICATE----- From 16c9afa9339fe4b941c5566890b3b16899e745e7 Mon Sep 17 00:00:00 2001 From: Oleg Makarov Date: Mon, 28 Mar 2022 11:12:43 +0300 Subject: [PATCH 2/6] Updated cert from hoverfly repo --- pytest_hoverfly/base.py | 2 +- pytest_hoverfly/cert.pem | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pytest_hoverfly/base.py b/pytest_hoverfly/base.py index e8e2670..7b62f0e 100644 --- a/pytest_hoverfly/base.py +++ b/pytest_hoverfly/base.py @@ -15,7 +15,7 @@ from docker.models.containers import Container -IMAGE = "spectolabs/hoverfly:v1.3.2" +IMAGE = "spectolabs/hoverfly:v1.3.6" CONTAINER_BASENAME = "test-hoverfly" diff --git a/pytest_hoverfly/cert.pem b/pytest_hoverfly/cert.pem index fa8d759..86e2c9c 100644 --- a/pytest_hoverfly/cert.pem +++ b/pytest_hoverfly/cert.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDbjCCAlagAwIBAgIUdQfaPu0RqbvS9x/4ZlBEu+sIjNMwDQYJKoZIhvcNAQEL -BQAwNjEbMBkGA1UEChMSSG92ZXJmbHkgQXV0aG9yaXR5MRcwFQYDVQQDEw5ob3Zl -cmZseS5wcm94eTAgFw05NDA0MDExMDAzMDNaGA8yMDUwMDMxODEwMDMwM1owNjEb -MBkGA1UEChMSSG92ZXJmbHkgQXV0aG9yaXR5MRcwFQYDVQQDEw5ob3ZlcmZseS5w -cm94eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3SNL9a5fB/p6YY -x50EyOTWUWwvAKvE8FW+2nWZjYR7wPGWzvc8iYAdcTPAFI5jru3DodBFjL2HHH72 -mVOj018xR8VMbQpGY3DXohldygqrYJVudYjHRIH9oDFx+Bp+CtEihK7MhyPFTKdF -ctwuO7O/tkqr7vHrOM+9PiqCtcziauZqgCbRLODeuWhKk+GQl/wbghcThFwf7GLP -dhAgsyeriA0s15PIqI9BWEOzPMvhQyUpLVPm6T29Zn38h+kG1zmu2L1yLXWcKClW -ewzEzXeL3syeYMVpsyvinFvWFPTbcpAv0QWA1Bm2u6TcxBuwsgxxMacdhwappNHf -KZJ6VkUCAwEAAaNyMHAwDgYDVR0PAQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUF -BwMBMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE9wZYweUuFZecYvepPPivik -w9yEMBkGA1UdEQQSMBCCDmhvdmVyZmx5LnByb3h5MA0GCSqGSIb3DQEBCwUAA4IB -AQAWq/ZZ5+JDR3rnkIuUhDqTzxbjKK43i59ckA6/j3ZnIf31bq3fJYBh+MIZ+NZa -aMJswXUW/OA/kYSS5UTdhatN2rdZkp3buz6bXkAgIFogjBDSulwl9igjVMt5Hlkc -3+4efHA926wHQp+44NBufQ7bWS4n5XU7NQ4sjfA/Eqi0PffMMIKO1qbkpzWVfAPZ -Fg0n8FglO8MRce+KmXoCdKqaPyI+gp2qBa3ACAN0pvnp2c8cB5axrWgq9wpOGBtD -N7f0FEqVebYlkutrEqiuo1g/vLlRZRB6UGH3qMN9Kxyc2AiPkilk+KZVvInheHG+ -HJHvboudnBsk3T2pcgoqoorS ------END CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIVAPFUKC/hDKXSN4nF4Gh/fG7Oby4KMA0GCSqGSIb3DQEB +CwUAMDYxGzAZBgNVBAoTEkhvdmVyZmx5IEF1dGhvcml0eTEXMBUGA1UEAxMOaG92 +ZXJmbHkucHJveHkwHhcNMjIwMzI3MjE0OTA4WhcNMzIwMzI0MjE0OTA4WjA2MRsw +GQYDVQQKExJIb3ZlcmZseSBBdXRob3JpdHkxFzAVBgNVBAMTDmhvdmVyZmx5LnBy +b3h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6mqE6O8H14tsul0B +UGhLuxFYdSFsjtWtcR4v5PJDK118pdoYC3hgvejcQHdjzuYfVJybo2UHxhEyomhu +r3KrpcjC0VnGfeibNXY01JDWMVxC2QgutGZb92/wChMBfOKYq5z4MhK+5gdiBkz2 +C8/1Q724sw14iIcQB+POY6lVBj3YI5Ja+hjSm6SWVvMVRk1uMgx2CcW6zbgErkNg +xvDnDPHlRl5aIIHNyDMlSczVtq0SlBrTtExmjSg2Edzo1v25DG1LBzV58zYE5/cr +Yh+Dm1XKB88sSBb8bUoAjZCWsl3Dkn8eR8wOdabZZxU/STP/g9yxTM1fcnc4v4e/ +QF0TnQIDAQABo3IwcDAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUH +AwEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUgrvEDpBhKH6SOUAC2fs8oTri +5XMwGQYDVR0RBBIwEIIOaG92ZXJmbHkucHJveHkwDQYJKoZIhvcNAQELBQADggEB +AOXmvQtdsH4kBGAnMI87SlFbAskrbeY/Kqr1PQyDTt2MVj/SjpsVxNEoIsS5ghcI +EyvhD/3t2q15D3XNc+wixSu8jCTe9N1CGXdiolfZ09SqiBtItvOh9R7pdkCcquh+ +69JJayOMInoSnmaf+ic+gbzLiEgfW+Dv/OR2Bmuelrs1zOnHdXhY45bN6PRQFrWt ++Wkr7OqTfoCAz6NGgSWcKrXymTtErX7ZJGYwSc2+nHQznl7RBdyL2BfQAVWaWmhI +s+IfxcKlYBr/nKWOkhD81VrNXFEj6R5kEYOdXYe9ovRmQhKWSz4cpCcMqtx1ye7K +1iBU2wVABfQZhp/3eiIyF9w= +-----END CERTIFICATE----- \ No newline at end of file From 7ee40a342a871b18f721fbd582740d940a2fe6e7 Mon Sep 17 00:00:00 2001 From: imflop Date: Mon, 28 Mar 2022 16:54:05 +0300 Subject: [PATCH 3/6] Updated workflow hoverfly version --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de1449b..641573f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,8 @@ name: CI on: push: - branches: [ master ] + branches: + - '*' pull_request: branches: [ master ] @@ -14,7 +15,7 @@ jobs: services: hoverfly: - image: spectolabs/hoverfly:v1.3.2 + image: spectolabs/hoverfly:v1.3.6 ports: - 8500:8500 - 8888:8888 From 90a694873e4b011a1c0fed8d5ed196a32e85dd64 Mon Sep 17 00:00:00 2001 From: imflop Date: Mon, 28 Mar 2022 16:58:01 +0300 Subject: [PATCH 4/6] Reterned ci settings for branches --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 641573f..fb6219b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,8 +2,7 @@ name: CI on: push: - branches: - - '*' + branches: [ master ] pull_request: branches: [ master ] From 75581dc48669f8c160b2f24693c2154e641fe6ea Mon Sep 17 00:00:00 2001 From: imflop Date: Mon, 28 Mar 2022 16:59:04 +0300 Subject: [PATCH 5/6] Updated version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e26d1f8..42ddb74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pytest_hoverfly" -version = "5.0.1" +version = "5.0.2" description = "Simplify working with Hoverfly from pytest" authors = ["Devops team at Wrike "] repository = "https://github.com/wrike/pytest-hoverfly" From bcf504b85ff4c01aecbc0e045401f4db8c8918ba Mon Sep 17 00:00:00 2001 From: imflop Date: Mon, 28 Mar 2022 17:12:01 +0300 Subject: [PATCH 6/6] Updated changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ab4e1..99f9226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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). +## [5.0.2] - 2022-03-28 +### Changed +- Bumped default Hoverfly image to 1.3.6 +- Updated outdated certificate + ## [5.0.1] - 2022-01-20 ### Added - Allow specifying the service host via `SERVICE_HOST` env var