Sort import regex's (#1550)

Merged PR #1550.
GoogleCloudPlatform · Mar 20, 2019 · f11706a · f11706a
1 parent d693e64
commit f11706a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/provider/terraform/import.rb b/provider/terraform/import.rb
@@ -52,7 +52,9 @@ def import_id_formats(resource)
         field_markers -= ['{{project}}', '{{region}}', '{{zone}}']
         short_id_default_format = field_markers.join('/')
 
-        (id_formats + [short_id_format, short_id_default_format]).uniq.reject(&:empty?)
+        # Regexes should be unique and ordered from most specific to least specific
+        (id_formats + [short_id_format, short_id_default_format])
+          .uniq.reject(&:empty?).sort_by { |i| i.count('/') }.reverse
       end
     end
   end