Merge pull request GoogleCloudPlatform#2339 from maqiuyujoyce/202407-…

…make-manifests Ensure files in PR snapshot matches 'make ready-pr' result
gemmahou · Jul 24, 2024 · 47f552f · 47f552f
2 parents 5c33d73 + ccd5807
commit 47f552f
Show file tree

Hide file tree

Showing 11 changed files with 366 additions and 14 deletions.
diff --git a/...ensions.k8s.io_v1_customresourcedefinition_redisclusters.redis.cnrm.cloud.google.com.yaml b/...ensions.k8s.io_v1_customresourcedefinition_redisclusters.redis.cnrm.cloud.google.com.yaml
diff --git a/pkg/clients/generated/apis/redis/v1alpha1/doc.go b/pkg/clients/generated/apis/redis/v1alpha1/doc.go
diff --git a/pkg/clients/generated/apis/redis/v1alpha1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/redis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/doc.go b/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/doc.go
diff --git a/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/doc.go b/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/doc.go
diff --git a/...ients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.go b/...ients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.go
diff --git a/...ients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/fake_rediscluster.go b/...ients/generated/client/clientset/versioned/typed/redis/v1alpha1/fake/fake_rediscluster.go
diff --git a/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/generated_expansion.go b/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/generated_expansion.go
diff --git a/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/redis_client.go b/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/redis_client.go
diff --git a/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/rediscluster.go b/pkg/clients/generated/client/clientset/versioned/typed/redis/v1alpha1/rediscluster.go
diff --git a/scripts/validate-prereqs.sh b/scripts/validate-prereqs.sh
@@ -40,22 +40,26 @@ if [[ "${changed_file_count}" != "0" ]]; then
 fi
 make manifests
 changed_file_count=$(git diff --name-only | wc -l)
-if [[ "${changed_file_count}" != "0" ]]; then
+added_config_file_count=$(git ls-files --others --exclude-standard config/ | wc -l)
+if [[ "${changed_file_count}" != "0" ]] || [[ "${added_config_file_count}" != "0" ]]; then
     echo "Full diff:"
     git diff
     echo "ERROR: Manifests must be regenerated. Please run 'make ready-pr' or 'make manifests' and update your PR."
     echo "Affected files:"
     git diff --name-only
+    git ls-files --others --exclude-standard config/
     exit 1
 fi
 make generate-go-client
 changed_file_count=$(git diff --name-only | wc -l)
-if [[ "${changed_file_count}" != "0" ]]; then
+added_go_client_file_count=$(git ls-files --others --exclude-standard pkg/clients/generated/ | wc -l)
+if [[ "${changed_file_count}" != "0" ]] || [[ "${added_go_client_file_count}" != "0" ]]; then
     echo "Full diff:"
     git diff
     echo "ERROR: Resource Go Clients must be regenerated. Please run 'make ready-pr' or 'make generate-go-client' and update your PR."
     echo "Affected files:"
     git diff --name-only
+    git ls-files --others --exclude-standard pkg/clients/generated/
     echo "First 100 lines of diff:"
     git diff | head -n100
     exit 1
@@ -75,11 +79,13 @@ if [[ "${changed_file_count}" != "0" ]]; then
 fi
 make resource-docs
 changed_file_count=$(git diff --name-only | wc -l)
-if [[ "${changed_file_count}" != "0" ]]; then
+added_reference_doc_file_count=$(git ls-files --others --exclude-standard scripts/generate-google3-docs/resource-reference/generated/ | wc -l)
+if [[ "${changed_file_count}" != "0" ]] || [[ "${added_reference_doc_file_count}" != "0" ]]; then
     echo "Full diff:"
     git diff
     echo "ERROR: Resource docs must be regenerated. Please run 'make ready-pr' or 'make resource-docs' and update your PR."
     echo "Affected files:"
     git diff --name-only
+    git ls-files --others --exclude-standard scripts/generate-google3-docs/resource-reference/generated/
     exit 1
 fi