Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B7C517B75 for ; Wed, 11 Feb 2015 18:01:16 +0000 (UTC) Received: (qmail 46844 invoked by uid 500); 11 Feb 2015 18:01:10 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 46814 invoked by uid 500); 11 Feb 2015 18:01:10 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 46805 invoked by uid 99); 11 Feb 2015 18:01:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 18:01:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 11 Feb 2015 18:01:06 +0000 Received: (qmail 45183 invoked by uid 99); 11 Feb 2015 18:00:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 18:00:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 759EBE01CB; Wed, 11 Feb 2015 18:00:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Remove thrift checksum verification script and resources. Date: Wed, 11 Feb 2015 18:00:46 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 49842be2a -> 7b531e986 Remove thrift checksum verification script and resources. Reviewed at https://reviews.apache.org/r/30859/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/7b531e98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/7b531e98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/7b531e98 Branch: refs/heads/master Commit: 7b531e9864ac964100096e487cdaac54e0415198 Parents: 49842be Author: Bill Farner Authored: Wed Feb 11 09:59:49 2015 -0800 Committer: Bill Farner Committed: Wed Feb 11 09:59:49 2015 -0800 ---------------------------------------------------------------------- .../org/apache/aurora/gen/api.thrift.md5 | 1 - .../apache/aurora/gen/internal_rpc.thrift.md5 | 1 - .../org/apache/aurora/gen/storage.thrift.md5 | 1 - .../apache/aurora/gen/storage_local.thrift.md5 | 1 - .../org/apache/aurora/gen/test.thrift.md5 | 1 - .../apache/thermos/thermos_internal.thrift.md5 | 1 - .../org/apache/aurora/verify_thrift_checksum.sh | 92 -------------------- 7 files changed, 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/aurora/gen/api.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/gen/api.thrift.md5 b/src/test/resources/org/apache/aurora/gen/api.thrift.md5 deleted file mode 100644 index e2bea71..0000000 --- a/src/test/resources/org/apache/aurora/gen/api.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -20d3ee1ae2debf847cfb322b882abdcf http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/aurora/gen/internal_rpc.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/gen/internal_rpc.thrift.md5 b/src/test/resources/org/apache/aurora/gen/internal_rpc.thrift.md5 deleted file mode 100644 index 875f2eb..0000000 --- a/src/test/resources/org/apache/aurora/gen/internal_rpc.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -5e1d044c0a618fa54988de12b034209f http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/aurora/gen/storage.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/gen/storage.thrift.md5 b/src/test/resources/org/apache/aurora/gen/storage.thrift.md5 deleted file mode 100644 index 6da2c2c..0000000 --- a/src/test/resources/org/apache/aurora/gen/storage.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -04be54e3997765d0c58cdc144323bdf4 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/aurora/gen/storage_local.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/gen/storage_local.thrift.md5 b/src/test/resources/org/apache/aurora/gen/storage_local.thrift.md5 deleted file mode 100644 index 335569b..0000000 --- a/src/test/resources/org/apache/aurora/gen/storage_local.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -7ec1e9b752cd56444b3c896479127c17 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/aurora/gen/test.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/gen/test.thrift.md5 b/src/test/resources/org/apache/aurora/gen/test.thrift.md5 deleted file mode 100644 index be750e0..0000000 --- a/src/test/resources/org/apache/aurora/gen/test.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -48b0b02586ed3f2661e7132d77a236cd http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/resources/org/apache/thermos/thermos_internal.thrift.md5 ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/thermos/thermos_internal.thrift.md5 b/src/test/resources/org/apache/thermos/thermos_internal.thrift.md5 deleted file mode 100644 index ba65ed2..0000000 --- a/src/test/resources/org/apache/thermos/thermos_internal.thrift.md5 +++ /dev/null @@ -1 +0,0 @@ -6702dae9e0b2262c2ba5dc2712502978 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7b531e98/src/test/sh/org/apache/aurora/verify_thrift_checksum.sh ---------------------------------------------------------------------- diff --git a/src/test/sh/org/apache/aurora/verify_thrift_checksum.sh b/src/test/sh/org/apache/aurora/verify_thrift_checksum.sh deleted file mode 100644 index 8496bd0..0000000 --- a/src/test/sh/org/apache/aurora/verify_thrift_checksum.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# -# 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. -# -set -o nounset - -# A test to remind us that we need to exercise care when making API and -# storage schema changes. -# There are two operating modes: verify and reset. Running the script with -# no arguments will use verify mode. Reset mode will overwrite all golden -# files with the current checksum of the source files. -# In other words: immediately after running in reset mode, the test should -# pass in verify mode. - -reset_mode=false -while getopts "r" opt -do - case ${opt} in - r) reset_mode=true ;; - *) exit 1; - esac -done - -if $reset_mode -then - echo 'Warning: Operating in reset mode. Rewriting golden checksum files.' -fi - -for file in $(find src/main/thrift -type f -name '*.thrift') -do - # Using python for lack of a better cross-platform checksumming without - # adding another build-time dependency. - checksum=$(python << EOF -import hashlib -with open('$file', 'rb') as f: - print(hashlib.md5(f.read()).hexdigest()) -EOF -) - golden_file=src/test/resources/${file#src/main/thrift/}.md5 - if $reset_mode - then - mkdir -p $(dirname "$golden_file") - echo "$checksum" > "$golden_file" - else - if [ ! -f "$golden_file" ] - then - echo "Golden file not found for $file, expected $golden_file" - exit 1 - fi - golden_checksum=$(cat "$golden_file") - if [ "$checksum" != "$golden_checksum" ] - then - echo "Golden checksum did not match for $file" - echo "Found $checksum, expected $golden_checksum" - echo - echo $(printf '!%.0s' {1..80}) - echo 'This means you changed a thrift file.' - echo 'Please think carefully before you proceed!' - echo - echo 'If you are changing an API or a storage schema you may need to ' - echo 'take additional actions to such as providing a client and/or ' - echo 'server-side migration strategy. You may also need to bump the ' - echo 'released version ID, following the guidelines at http://semver.org' - echo - echo 'This test is not here to help you make those changes, but to ' - echo 'remind you to take appropriate follow-up actions relating to your ' - echo 'schema change.' - echo - echo 'Once you are confident that you have appropriately supported this ' - echo 'change in relevant code, you can fix this test by running ' - echo "sh $0 -r" - echo $(printf '!%.0s' {1..80}) - exit 1 - fi - fi -done - -if ! $reset_mode -then - echo "All checksums match." -fi -exit 0